sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

mozilla-headless: Update to work with recent git changes 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-12-10 14:00:23 +00:00
parent 9e27801055
commit 7ab7ad82f4
9 changed files with 257 additions and 1741 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1486
meta/packages/mozilla-headless/mozilla-headless-0.0+hg-1.0+a3e7c6626661/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
View File

File diff suppressed because it is too large Load Diff

23
meta/packages/mozilla-headless/mozilla-headless-0.0+hg-1.0+a3e7c6626661/mozconfig
View File

@ -1,23 +0,0 @@
# this line sets the directory for all build output
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-release
# comment out the previous line and uncomment these two for a debug build
#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-debug
#ac_add_options --disable-optimize --enable-debug
# this is the line that enables the headless implementation
ac_add_options --enable-default-toolkit=cairo-headless
# comment out the previous line and uncomment these two for a GTK build
#ac_add_options --enable-system-cairo
#ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-tests
ac_add_options --disable-javaxpcom
ac_add_options --enable-application=xulrunner
ac_add_options --enable-pango
ac_add_options --disable-printing
ac_add_options --disable-crashreporter
ac_add_options --enable-plugins
ac_add_options --disable-accessibility
mk_add_options MOZ_CO_PROJECT=xulrunner

24
meta/packages/mozilla-headless/mozilla-headless-0.0+hg-1.0+a3e7c6626661/mozilla-jemalloc.patch
View File

@ -1,24 +0,0 @@
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- a/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100
+++ b/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
} jemalloc_stats_t;
#ifndef MOZ_MEMORY_DARWIN
-void *malloc(size_t size);
-void *valloc(size_t size);
-void *calloc(size_t num, size_t size);
-void *realloc(void *ptr, size_t size);
-void free(void *ptr);
+void *malloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *valloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur;
+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur;
+void free(void *ptr) __THROW __attribute_malloc__ __wur;
#endif
-int posix_memalign(void **memptr, size_t alignment, size_t size);
+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__ __wur;
void *memalign(size_t alignment, size_t size);
size_t malloc_usable_size(const void *ptr);
void jemalloc_stats(jemalloc_stats_t *stats);

14
meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch Normal file
View File

@ -0,0 +1,14 @@
diff -r ad8be5166ccd layout/generic/nsFrame.h
--- a/layout/generic/nsFrame.h Tue Nov 17 19:24:56 2009 +0000
+++ b/layout/generic/nsFrame.h Thu Nov 19 12:33:38 2009 +0000
@@ -151,7 +151,7 @@
// Left undefined; nsFrame objects are never allocated from the heap.
void* operator new(size_t sz) CPP_THROW_NEW;
-protected:
+public:
// Overridden to prevent the global delete from being called, since
// the memory came out of an arena instead of the heap.
//

187
meta/packages/mozilla-headless/mozilla-headless-0.0+hg-1.0+a3e7c6626661/configurefix.patch → meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
View File

@ -1,7 +1,7 @@
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-04-16 22:51:48.000000000 +0100
+++ offscreen/configure.in 2009-04-16 23:07:48.000000000 +0100
--- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -62,7 +62,6 @@
AC_PREREQ(2.13)
@ -18,7 +18,7 @@ Index: offscreen/configure.in
dnl Set the version number of the libs included with mozilla
dnl ========================================================
@@ -136,6 +134,9 @@
@@ -135,6 +133,9 @@
MSMANIFEST_TOOL=
@ -28,7 +28,7 @@ Index: offscreen/configure.in
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -281,7 +282,7 @@
@@ -285,7 +286,7 @@
;;
esac
@ -37,7 +37,7 @@ Index: offscreen/configure.in
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -319,7 +320,7 @@
@@ -323,7 +324,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -46,7 +46,7 @@ Index: offscreen/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -327,7 +328,7 @@
@@ -331,7 +332,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -55,7 +55,7 @@ Index: offscreen/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -348,7 +349,7 @@
@@ -352,7 +353,7 @@
;;
esac
@ -64,7 +64,7 @@ Index: offscreen/configure.in
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -372,37 +373,6 @@
@@ -376,37 +377,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
AC_DEFINE(CROSS_COMPILE)
@ -102,7 +102,7 @@ Index: offscreen/configure.in
GNU_AS=
GNU_LD=
@@ -1569,6 +1539,7 @@
@@ -1606,6 +1576,7 @@
'
dnl test that the macros actually work:
@ -110,7 +110,7 @@ Index: offscreen/configure.in
AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
[AC_LANG_SAVE
@@ -2730,9 +2701,13 @@
@@ -2767,9 +2738,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
@ -124,7 +124,7 @@ Index: offscreen/configure.in
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -3115,19 +3090,9 @@
@@ -3152,19 +3127,9 @@
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
@ -145,7 +145,7 @@ Index: offscreen/configure.in
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -6931,18 +6896,13 @@
@@ -7007,18 +6972,13 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
@ -166,7 +166,7 @@ Index: offscreen/configure.in
dnl ========================================================
dnl =
@@ -7454,10 +7414,7 @@
@@ -7530,10 +7490,7 @@
dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
dnl to either libIDL1 or libIDL2.
if test -z "$_LIBIDL_FOUND"; then
@ -177,7 +177,7 @@ Index: offscreen/configure.in
fi
dnl
dnl If we don't have a libIDL config program & not cross-compiling,
@@ -7529,13 +7486,7 @@
@@ -7605,13 +7562,7 @@
fi
if test -z "$SKIP_PATH_CHECKS"; then
@ -191,7 +191,7 @@ Index: offscreen/configure.in
fi
if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
@@ -8346,10 +8297,7 @@
@@ -8457,10 +8408,7 @@
HAVE_WCRTOMB
"
@ -203,7 +203,7 @@ Index: offscreen/configure.in
)
# Save the defines header file before autoconf removes it.
@@ -8408,31 +8356,11 @@
@@ -8519,31 +8467,11 @@
dnl To add new Makefiles, edit allmakefiles.sh.
dnl allmakefiles.sh sets the variable, MAKEFILES.
. ${srcdir}/allmakefiles.sh
@ -235,7 +235,7 @@ Index: offscreen/configure.in
dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
if test "$CAIRO_FEATURES_H"; then
if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
@@ -8458,14 +8386,14 @@
@@ -8569,14 +8497,14 @@
HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
RC=
@ -253,7 +253,7 @@ Index: offscreen/configure.in
if test -z "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --disable-debug"
fi
@@ -8481,8 +8409,7 @@
@@ -8592,8 +8520,7 @@
if test -n "$USE_ARM_KUSER"; then
ac_configure_args="$ac_configure_args --with-arm-kuser"
fi
@ -263,7 +263,7 @@ Index: offscreen/configure.in
fi
if test -z "$MOZ_NATIVE_NSPR"; then
@@ -8499,7 +8426,6 @@
@@ -8610,7 +8537,6 @@
# Run the SpiderMonkey 'configure' script.
dist=$MOZ_BUILD_ROOT/dist
@ -271,9 +271,9 @@ Index: offscreen/configure.in
ac_configure_args="$ac_configure_args --enable-threadsafe"
if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
@@ -8513,11 +8439,14 @@
if test "$MOZ_MEMORY"; then
ac_configure_args="$ac_configure_args --enable-jemalloc"
@@ -8627,11 +8553,14 @@
export MOZ_MEMORY_LDFLAGS
fi
fi
-AC_OUTPUT_SUBDIRS(js/src)
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
@ -290,8 +290,8 @@ Index: offscreen/configure.in
if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-04-16 22:51:49.000000000 +0100
+++ offscreen/js/src/configure.in 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -62,7 +62,6 @@
AC_PREREQ(2.13)
@ -310,7 +310,7 @@ Index: offscreen/js/src/configure.in
dnl Set the version number of the libs included with mozilla
dnl ========================================================
NSPR_VERSION=4
@@ -114,6 +116,8 @@
@@ -113,6 +115,8 @@
MSMANIFEST_TOOL=
@ -319,7 +319,7 @@ Index: offscreen/js/src/configure.in
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -200,7 +204,7 @@
@@ -198,7 +202,7 @@
if test "$COMPILE_ENVIRONMENT"; then
@ -328,7 +328,7 @@ Index: offscreen/js/src/configure.in
echo "cross compiling from $host to $target"
_SAVE_CC="$CC"
@@ -237,7 +241,7 @@
@@ -235,7 +239,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -337,7 +337,7 @@ Index: offscreen/js/src/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -245,7 +249,7 @@
@@ -243,7 +247,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -346,7 +346,7 @@ Index: offscreen/js/src/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -266,7 +270,7 @@
@@ -298,7 +302,7 @@
;;
esac
@ -355,7 +355,7 @@ Index: offscreen/js/src/configure.in
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -296,37 +300,6 @@
@@ -328,37 +332,6 @@
dnl able to run ppc code in a translated environment, making a cross
dnl compiler appear native. So we override that here.
cross_compiling=yes
@ -393,7 +393,7 @@ Index: offscreen/js/src/configure.in
GNU_AS=
GNU_LD=
@@ -1435,6 +1408,8 @@
@@ -1424,6 +1397,8 @@
fi # GNU_CC
fi # COMPILE_ENVIRONMENT
@ -402,7 +402,7 @@ Index: offscreen/js/src/configure.in
dnl =================================================================
dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
dnl which is bad when cross compiling.
@@ -2565,9 +2540,13 @@
@@ -2579,9 +2554,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
@ -416,7 +416,7 @@ Index: offscreen/js/src/configure.in
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -2592,7 +2571,8 @@
@@ -2606,7 +2585,8 @@
AC_CHECK_HEADER(stdint.h)
if test "$ac_cv_header_stdint_h" = yes; then
@ -426,7 +426,7 @@ Index: offscreen/js/src/configure.in
else
dnl We'll figure them out for ourselves. List more likely types
dnl earlier. If we ever really encounter a size for which none of
@@ -2990,10 +2970,7 @@
@@ -3004,10 +2984,7 @@
;;
*)
AC_CHECK_LIB(m, atan)
@ -438,7 +438,7 @@ Index: offscreen/js/src/configure.in
;;
esac
@@ -3908,6 +3885,7 @@
@@ -3903,6 +3880,7 @@
[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
See --with-nspr-cflags for more details.],
NSPR_LIBS=$withval)
@ -446,7 +446,7 @@ Index: offscreen/js/src/configure.in
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
@@ -4542,18 +4520,11 @@
@@ -4512,18 +4490,11 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
@ -465,7 +465,7 @@ Index: offscreen/js/src/configure.in
dnl ========================================================
dnl =
@@ -5256,6 +5227,8 @@
@@ -5231,6 +5202,8 @@
done
AC_SUBST(LIBS_PATH)
@ -474,15 +474,15 @@ Index: offscreen/js/src/configure.in
dnl ========================================================
dnl JavaScript shell
dnl ========================================================
@@ -5396,3 +5369,4 @@
@@ -5371,3 +5344,4 @@
# 'js-config' in Makefile.in.
AC_MSG_RESULT(invoking make to create js-config script)
$MAKE js-config
+
Index: offscreen/nsprpub/configure.in
===================================================================
--- offscreen.orig/nsprpub/configure.in 2009-04-16 18:09:00.000000000 +0100
+++ offscreen/nsprpub/configure.in 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -42,7 +42,6 @@
AC_PREREQ(2.12)
AC_INIT(config/libc_r.h)
@ -491,7 +491,7 @@ Index: offscreen/nsprpub/configure.in
AC_CANONICAL_SYSTEM
dnl ========================================================
@@ -400,7 +399,7 @@
@@ -396,7 +395,7 @@
dnl ========================================================
dnl Checks for compilers.
dnl ========================================================
@ -500,7 +500,7 @@ Index: offscreen/nsprpub/configure.in
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -427,7 +426,7 @@
@@ -423,7 +422,7 @@
AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -509,7 +509,7 @@ Index: offscreen/nsprpub/configure.in
AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
CC=$_SAVE_CC
@@ -448,7 +447,7 @@
@@ -444,7 +443,7 @@
;;
esac
@ -518,7 +518,7 @@ Index: offscreen/nsprpub/configure.in
unset ac_cv_prog_CC
AC_PROG_CC
if test -n "$USE_CPLUS"; then
@@ -474,30 +473,6 @@
@@ -470,30 +469,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
@ -549,7 +549,7 @@ Index: offscreen/nsprpub/configure.in
if test "$GCC" = "yes"; then
GNU_CC=1
fi
@@ -518,11 +493,8 @@
@@ -514,11 +489,8 @@
;;
esac
@ -562,7 +562,7 @@ Index: offscreen/nsprpub/configure.in
dnl ========================================================
dnl Check for gcc -pipe support
@@ -2249,10 +2221,7 @@
@@ -2283,10 +2255,7 @@
*-darwin*|*-beos*)
;;
*)
@ -574,7 +574,7 @@ Index: offscreen/nsprpub/configure.in
esac
@@ -2869,6 +2838,8 @@
@@ -2904,6 +2873,8 @@
dnl pr/tests/w16gui/Makefile
dnl tools/Makefile
@ -583,29 +583,17 @@ Index: offscreen/nsprpub/configure.in
if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
elif test -n "$USE_PTHREADS"; then
@@ -2884,3 +2855,5 @@
@@ -2919,3 +2890,5 @@
echo $MAKEFILES > unallmakefiles
AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
+
+
Index: offscreen/toolkit/toolkit-makefiles.sh
===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-04-16 22:51:50.000000000 +0100
+++ offscreen/toolkit/toolkit-makefiles.sh 2009-04-16 23:06:42.000000000 +0100
@@ -628,7 +628,6 @@
toolkit/crashreporter/client/Makefile
toolkit/crashreporter/google-breakpad/src/client/Makefile
toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile
- toolkit/crashreporter/google-breakpad/src/client/windows/Makefile
toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile
toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile
toolkit/crashreporter/google-breakpad/src/common/Makefile
Index: offscreen/js/src/Makefile.in
===================================================================
--- offscreen.orig/js/src/Makefile.in 2009-04-16 18:07:56.000000000 +0100
+++ offscreen/js/src/Makefile.in 2009-04-16 23:06:42.000000000 +0100
@@ -507,20 +507,8 @@
--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -514,20 +514,8 @@
export:: jsautocfg.h
@ -626,7 +614,7 @@ Index: offscreen/js/src/Makefile.in
# jscpucfg is a strange target
# Needs to be built with the host compiler but needs to include
@@ -550,7 +538,7 @@
@@ -557,7 +545,7 @@
echo no need to build jscpucfg $<
else
jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
@ -637,8 +625,8 @@ Index: offscreen/js/src/Makefile.in
Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-04-16 18:08:00.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
@@ -47,6 +47,8 @@
#include <stdarg.h>
@ -650,8 +638,8 @@ Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
#include "nsCOMPtr.h"
Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 18:08:00.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
@@ -39,6 +39,8 @@
*
* ***** END LICENSE BLOCK ***** */
@ -663,8 +651,8 @@ Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
#include "mozJSSubScriptLoader.h"
Index: offscreen/modules/lcms/include/icc34.h
===================================================================
--- offscreen.orig/modules/lcms/include/icc34.h 2009-04-16 18:08:47.000000000 +0100
+++ offscreen/modules/lcms/include/icc34.h 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
@@ -144,7 +144,7 @@
*/
@ -676,9 +664,9 @@ Index: offscreen/modules/lcms/include/icc34.h
Added the stupid check for autoconf by Marti Maria.
Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
===================================================================
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-04-16 18:09:35.000000000 +0100
+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-04-16 23:06:42.000000000 +0100
@@ -59,7 +59,7 @@
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -60,7 +60,7 @@
LIBS += \
$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
@ -689,8 +677,8 @@ Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
ifeq ($(OS_ARCH),WINNT)
Index: offscreen/xpcom/sample/program/Makefile.in
===================================================================
--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-04-16 18:09:47.000000000 +0100
+++ offscreen/xpcom/sample/program/Makefile.in 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -57,7 +57,7 @@
# that the application be linked against the XPCOM dynamic library or the NSPR
# dynamic libraries.
@ -702,8 +690,8 @@ Index: offscreen/xpcom/sample/program/Makefile.in
# Need to link with CoreFoundation on Mac
Index: offscreen/xpcom/tools/registry/Makefile.in
===================================================================
--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-04-16 18:09:48.000000000 +0100
+++ offscreen/xpcom/tools/registry/Makefile.in 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -54,7 +54,7 @@
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
@ -715,9 +703,9 @@ Index: offscreen/xpcom/tools/registry/Makefile.in
# Need to link with CoreFoundation on Mac
Index: offscreen/xulrunner/app/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/app/Makefile.in 2009-04-16 18:09:50.000000000 +0100
+++ offscreen/xulrunner/app/Makefile.in 2009-04-16 23:06:42.000000000 +0100
@@ -180,7 +180,7 @@
--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -184,7 +184,7 @@
RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
@ -728,8 +716,8 @@ Index: offscreen/xulrunner/app/Makefile.in
Index: offscreen/xulrunner/stub/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/stub/Makefile.in 2009-04-16 18:09:50.000000000 +0100
+++ offscreen/xulrunner/stub/Makefile.in 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -101,7 +101,7 @@
endif
endif
@ -741,8 +729,8 @@ Index: offscreen/xulrunner/stub/Makefile.in
Index: offscreen/modules/plugin/test/testplugin/Makefile.in
===================================================================
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-04-16 18:08:56.000000000 +0100
+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -63,9 +63,7 @@
CMMSRCS = nptest_macosx.mm
endif
@ -751,25 +739,26 @@ Index: offscreen/modules/plugin/test/testplugin/Makefile.in
CPPSRCS += nptest_gtk2.cpp
-endif
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
CPPSRCS += nptest_qt.cpp
Index: offscreen/xulrunner/installer/libxul-unstable.pc.in
===================================================================
--- offscreen.orig/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 18:09:50.000000000 +0100
+++ offscreen/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 23:06:42.000000000 +0100
@@ -8,5 +8,5 @@
Description: The Mozilla Runtime and Embedding Engine (unstable API)
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
+Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -lsmime3 -lnss3 -lssl3 -lnssutil3 -L${sdkdir}/../xulrunner-1.9.2a1pre
Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nptest_os2.cpp
Index: offscreen/js/src/aclocal.m4
===================================================================
--- offscreen.orig/js/src/aclocal.m4 2009-04-16 18:07:56.000000000 +0100
+++ offscreen/js/src/aclocal.m4 2009-04-16 23:06:42.000000000 +0100
--- offscreen.orig/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
@@ -9,4 +9,3 @@
builtin(include, build/autoconf/moznbytetype.m4)dnl
builtin(include, build/autoconf/mozprog.m4)dnl
-MOZ_PROG_CHECKMSYS()
Index: offscreen/toolkit/toolkit-makefiles.sh
===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
+++ offscreen/toolkit/toolkit-makefiles.sh 2009-06-12 14:20:09.000000000 +0100
@@ -342,7 +342,6 @@
modules/plugin/sdk/samples/Makefile
modules/plugin/sdk/samples/common/Makefile
modules/plugin/sdk/samples/basic/windows/Makefile
- modules/plugin/sdk/samples/basic/unix/Makefile
modules/plugin/sdk/samples/winless/windows/Makefile
"

194
meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
View File

@ -1,8 +1,8 @@
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/configure.in 2009-06-12 14:15:55.000000000 +0100
@@ -62,7 +62,6 @@
--- offscreen.orig/configure.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/configure.in 2009-12-09 13:38:51.000000000 +0000
@@ -64,7 +64,6 @@
AC_PREREQ(2.13)
AC_INIT(config/config.mk)
@ -10,7 +10,7 @@ Index: offscreen/configure.in
AC_CANONICAL_SYSTEM
TARGET_CPU="${target_cpu}"
TARGET_VENDOR="${target_vendor}"
@@ -103,7 +102,6 @@
@@ -106,7 +105,6 @@
_SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
_SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
@ -18,7 +18,7 @@ Index: offscreen/configure.in
dnl Set the version number of the libs included with mozilla
dnl ========================================================
@@ -135,6 +133,9 @@
@@ -139,6 +137,9 @@
MSMANIFEST_TOOL=
@ -28,7 +28,7 @@ Index: offscreen/configure.in
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -285,7 +286,7 @@
@@ -308,7 +309,7 @@
;;
esac
@ -37,7 +37,7 @@ Index: offscreen/configure.in
echo "cross compiling from $host to $target"
cross_compiling=yes
@@ -323,7 +324,7 @@
@@ -346,7 +347,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -46,7 +46,7 @@ Index: offscreen/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -331,7 +332,7 @@
@@ -354,7 +355,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -55,7 +55,7 @@ Index: offscreen/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -352,7 +353,7 @@
@@ -375,7 +376,7 @@
;;
esac
@ -64,7 +64,7 @@ Index: offscreen/configure.in
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -376,37 +377,6 @@
@@ -399,37 +400,6 @@
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
AC_DEFINE(CROSS_COMPILE)
@ -102,7 +102,7 @@ Index: offscreen/configure.in
GNU_AS=
GNU_LD=
@@ -1606,6 +1576,7 @@
@@ -1586,6 +1556,7 @@
'
dnl test that the macros actually work:
@ -110,7 +110,7 @@ Index: offscreen/configure.in
AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
[AC_LANG_SAVE
@@ -2767,9 +2738,13 @@
@@ -2770,9 +2741,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
@ -124,7 +124,7 @@ Index: offscreen/configure.in
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -3152,19 +3127,9 @@
@@ -3174,21 +3149,9 @@
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
@ -133,6 +133,8 @@ Index: offscreen/configure.in
- ;;
-*-beos*)
- ;;
-*-os2*)
- ;;
-*)
AC_CHECK_LIB(m, atan)
AC_CHECK_LIB(dl, dlopen,
@ -145,7 +147,7 @@ Index: offscreen/configure.in
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -7007,18 +6972,13 @@
@@ -6889,18 +6852,13 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
@ -166,7 +168,7 @@ Index: offscreen/configure.in
dnl ========================================================
dnl =
@@ -7530,10 +7490,7 @@
@@ -7420,10 +7378,7 @@
dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
dnl to either libIDL1 or libIDL2.
if test -z "$_LIBIDL_FOUND"; then
@ -177,7 +179,7 @@ Index: offscreen/configure.in
fi
dnl
dnl If we don't have a libIDL config program & not cross-compiling,
@@ -7605,13 +7562,7 @@
@@ -7495,13 +7450,7 @@
fi
if test -z "$SKIP_PATH_CHECKS"; then
@ -191,7 +193,7 @@ Index: offscreen/configure.in
fi
if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
@@ -8457,10 +8408,7 @@
@@ -8278,10 +8227,7 @@
HAVE_WCRTOMB
"
@ -203,7 +205,7 @@ Index: offscreen/configure.in
)
# Save the defines header file before autoconf removes it.
@@ -8519,31 +8467,11 @@
@@ -8340,31 +8286,11 @@
dnl To add new Makefiles, edit allmakefiles.sh.
dnl allmakefiles.sh sets the variable, MAKEFILES.
. ${srcdir}/allmakefiles.sh
@ -235,7 +237,7 @@ Index: offscreen/configure.in
dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
if test "$CAIRO_FEATURES_H"; then
if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
@@ -8569,14 +8497,14 @@
@@ -8390,14 +8316,14 @@
HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
RC=
@ -253,7 +255,7 @@ Index: offscreen/configure.in
if test -z "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --disable-debug"
fi
@@ -8592,8 +8520,7 @@
@@ -8413,8 +8339,7 @@
if test -n "$USE_ARM_KUSER"; then
ac_configure_args="$ac_configure_args --with-arm-kuser"
fi
@ -263,7 +265,7 @@ Index: offscreen/configure.in
fi
if test -z "$MOZ_NATIVE_NSPR"; then
@@ -8610,7 +8537,6 @@
@@ -8431,7 +8356,6 @@
# Run the SpiderMonkey 'configure' script.
dist=$MOZ_BUILD_ROOT/dist
@ -271,7 +273,7 @@ Index: offscreen/configure.in
ac_configure_args="$ac_configure_args --enable-threadsafe"
if test -z "$MOZ_NATIVE_NSPR"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
@@ -8627,11 +8553,14 @@
@@ -8448,8 +8372,7 @@
export MOZ_MEMORY_LDFLAGS
fi
fi
@ -279,19 +281,38 @@ Index: offscreen/configure.in
-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+AC_CONFIG_SUBDIRS(js/src)
fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
# Build jsctypes on the platforms we can.
if test "$BUILD_CTYPES"; then
@@ -8465,20 +8388,14 @@
if test -n "$CROSS_COMPILE"; then
ac_configure_args="$ac_configure_args --build=$build --host=$target"
fi
- if test "$SOLARIS_SUNPRO_CC"; then
- # Always use gcc for libffi on Solaris
- old_cache_file=$cache_file
- cache_file=js/ctypes/libffi/config.cache
- ac_configure_args="$ac_configure_args CC=gcc"
- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
- cache_file=$old_cache_file
- else
- AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
- fi
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ AC_CONFIG_SUBDIRS(js/ctypes/libffi)
fi
fi
+m4_pattern_allow(AS_BIN)
+
+AC_OUTPUT($MAKEFILES)
+
fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
dnl Needs to be at the end to respect possible changes from NSPR configure
if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
--- offscreen.orig/js/src/configure.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/configure.in 2009-12-09 13:38:51.000000000 +0000
@@ -62,7 +62,6 @@
AC_PREREQ(2.13)
@ -319,7 +340,7 @@ Index: offscreen/js/src/configure.in
dnl Set various checks
dnl ========================================================
MISSING_X=
@@ -198,7 +202,7 @@
@@ -212,7 +216,7 @@
if test "$COMPILE_ENVIRONMENT"; then
@ -328,7 +349,7 @@ Index: offscreen/js/src/configure.in
echo "cross compiling from $host to $target"
_SAVE_CC="$CC"
@@ -235,7 +239,7 @@
@@ -249,7 +253,7 @@
AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -337,7 +358,7 @@ Index: offscreen/js/src/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
CC="$HOST_CXX"
@@ -243,7 +247,7 @@
@@ -257,7 +261,7 @@
AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);],
@ -346,7 +367,7 @@ Index: offscreen/js/src/configure.in
AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
CC=$_SAVE_CC
@@ -298,7 +302,7 @@
@@ -312,7 +316,7 @@
;;
esac
@ -355,7 +376,7 @@ Index: offscreen/js/src/configure.in
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
@@ -328,37 +332,6 @@
@@ -342,37 +346,6 @@
dnl able to run ppc code in a translated environment, making a cross
dnl compiler appear native. So we override that here.
cross_compiling=yes
@ -393,7 +414,7 @@ Index: offscreen/js/src/configure.in
GNU_AS=
GNU_LD=
@@ -1424,6 +1397,8 @@
@@ -1370,6 +1343,8 @@
fi # GNU_CC
fi # COMPILE_ENVIRONMENT
@ -402,7 +423,7 @@ Index: offscreen/js/src/configure.in
dnl =================================================================
dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
dnl which is bad when cross compiling.
@@ -2579,9 +2554,13 @@
@@ -2557,9 +2532,13 @@
AC_LANG_C
AC_HEADER_STDC
AC_C_CONST
@ -416,7 +437,7 @@ Index: offscreen/js/src/configure.in
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
AC_MSG_CHECKING(for siginfo_t)
@@ -2606,7 +2585,8 @@
@@ -2584,7 +2563,8 @@
AC_CHECK_HEADER(stdint.h)
if test "$ac_cv_header_stdint_h" = yes; then
@ -426,7 +447,7 @@ Index: offscreen/js/src/configure.in
else
dnl We'll figure them out for ourselves. List more likely types
dnl earlier. If we ever really encounter a size for which none of
@@ -3004,10 +2984,7 @@
@@ -2938,10 +2918,7 @@
;;
*)
AC_CHECK_LIB(m, atan)
@ -438,7 +459,7 @@ Index: offscreen/js/src/configure.in
;;
esac
@@ -3903,6 +3880,7 @@
@@ -3847,6 +3824,7 @@
[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
See --with-nspr-cflags for more details.],
NSPR_LIBS=$withval)
@ -446,7 +467,7 @@ Index: offscreen/js/src/configure.in
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
@@ -4512,18 +4490,11 @@
@@ -4386,18 +4364,11 @@
# Demangle only for debug or trace-malloc builds
MOZ_DEMANGLE_SYMBOLS=
@ -465,24 +486,24 @@ Index: offscreen/js/src/configure.in
dnl ========================================================
dnl =
@@ -5231,6 +5202,8 @@
done
AC_SUBST(LIBS_PATH)
@@ -5097,6 +5068,8 @@
AC_HAVE_FUNCS(setlocale)
+
+
dnl ========================================================
dnl JavaScript shell
dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
dnl ========================================================
@@ -5371,3 +5344,4 @@
@@ -5234,3 +5207,4 @@
# 'js-config' in Makefile.in.
AC_MSG_RESULT(invoking make to create js-config script)
$MAKE js-config
+
Index: offscreen/nsprpub/configure.in
===================================================================
--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
--- offscreen.orig/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
@@ -42,7 +42,6 @@
AC_PREREQ(2.12)
AC_INIT(config/libc_r.h)
@ -562,8 +583,8 @@ Index: offscreen/nsprpub/configure.in
dnl ========================================================
dnl Check for gcc -pipe support
@@ -2283,10 +2255,7 @@
*-darwin*|*-beos*)
@@ -2286,10 +2258,7 @@
*-darwin*|*-beos*|*-os2*)
;;
*)
- AC_CHECK_LIB(dl, dlopen,
@ -574,7 +595,7 @@ Index: offscreen/nsprpub/configure.in
esac
@@ -2904,6 +2873,8 @@
@@ -2907,6 +2876,8 @@
dnl pr/tests/w16gui/Makefile
dnl tools/Makefile
@ -583,7 +604,7 @@ Index: offscreen/nsprpub/configure.in
if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
elif test -n "$USE_PTHREADS"; then
@@ -2919,3 +2890,5 @@
@@ -2922,3 +2893,5 @@
echo $MAKEFILES > unallmakefiles
AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
@ -591,9 +612,9 @@ Index: offscreen/nsprpub/configure.in
+
Index: offscreen/js/src/Makefile.in
===================================================================
--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -514,20 +514,8 @@
--- offscreen.orig/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -513,20 +513,8 @@
export:: jsautocfg.h
@ -614,7 +635,7 @@ Index: offscreen/js/src/Makefile.in
# jscpucfg is a strange target
# Needs to be built with the host compiler but needs to include
@@ -557,7 +545,7 @@
@@ -556,7 +544,7 @@
echo no need to build jscpucfg $<
else
jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
@ -625,8 +646,8 @@ Index: offscreen/js/src/Makefile.in
Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-12-09 13:10:12.000000000 +0000
@@ -47,6 +47,8 @@
#include <stdarg.h>
@ -638,8 +659,8 @@ Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
#include "nsCOMPtr.h"
Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
===================================================================
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-12-09 13:10:12.000000000 +0000
@@ -39,6 +39,8 @@
*
* ***** END LICENSE BLOCK ***** */
@ -649,24 +670,11 @@ Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
#if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
#include "mozJSSubScriptLoader.h"
Index: offscreen/modules/lcms/include/icc34.h
===================================================================
--- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
@@ -144,7 +144,7 @@
*/
-#ifdef PACKAGE_NAME
+#if 0
/*
June 9, 2003, Adapted for use with configure by Bob Friesenhahn
Added the stupid check for autoconf by Marti Maria.
Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
===================================================================
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -60,7 +60,7 @@
--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -56,7 +56,7 @@
LIBS += \
$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
@ -677,8 +685,8 @@ Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
ifeq ($(OS_ARCH),WINNT)
Index: offscreen/xpcom/sample/program/Makefile.in
===================================================================
--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xpcom/sample/program/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -57,7 +57,7 @@
# that the application be linked against the XPCOM dynamic library or the NSPR
# dynamic libraries.
@ -690,8 +698,8 @@ Index: offscreen/xpcom/sample/program/Makefile.in
# Need to link with CoreFoundation on Mac
Index: offscreen/xpcom/tools/registry/Makefile.in
===================================================================
--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xpcom/tools/registry/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -54,7 +54,7 @@
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
@ -703,9 +711,9 @@ Index: offscreen/xpcom/tools/registry/Makefile.in
# Need to link with CoreFoundation on Mac
Index: offscreen/xulrunner/app/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -184,7 +184,7 @@
--- offscreen.orig/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -173,7 +173,7 @@
RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
@ -716,9 +724,9 @@ Index: offscreen/xulrunner/app/Makefile.in
Index: offscreen/xulrunner/stub/Makefile.in
===================================================================
--- offscreen.orig/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -101,7 +101,7 @@
--- offscreen.orig/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/xulrunner/stub/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -100,7 +100,7 @@
endif
endif
@ -729,9 +737,9 @@ Index: offscreen/xulrunner/stub/Makefile.in
Index: offscreen/modules/plugin/test/testplugin/Makefile.in
===================================================================
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
@@ -63,9 +63,7 @@
--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-12-09 13:10:12.000000000 +0000
@@ -60,9 +60,7 @@
CMMSRCS = nptest_macosx.mm
endif
@ -743,18 +751,20 @@ Index: offscreen/modules/plugin/test/testplugin/Makefile.in
CPPSRCS += nptest_os2.cpp
Index: offscreen/js/src/aclocal.m4
===================================================================
--- offscreen.orig/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
@@ -9,4 +9,3 @@
--- offscreen.orig/js/src/aclocal.m4 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/js/src/aclocal.m4 2009-12-09 13:39:01.000000000 +0000
@@ -8,6 +8,4 @@
builtin(include, build/autoconf/altoptions.m4)dnl
builtin(include, build/autoconf/moznbytetype.m4)dnl
builtin(include, build/autoconf/mozprog.m4)dnl
-builtin(include, build/autoconf/acwinpaths.m4)dnl
-MOZ_PROG_CHECKMSYS()
Index: offscreen/toolkit/toolkit-makefiles.sh
===================================================================
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
+++ offscreen/toolkit/toolkit-makefiles.sh 2009-06-12 14:20:09.000000000 +0100
@@ -342,7 +342,6 @@
--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
+++ offscreen/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
@@ -369,7 +369,6 @@
modules/plugin/sdk/samples/Makefile
modules/plugin/sdk/samples/common/Makefile
modules/plugin/sdk/samples/basic/windows/Makefile

0
meta/packages/mozilla-headless/mozilla-headless-0.0+hg-1.0+a3e7c6626661/removebadrpath.patch → meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
View File

32
meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
View File

@ -1,8 +1,8 @@
Index: offscreen/js/src/configure.in
===================================================================
--- offscreen.orig/js/src/configure.in 2009-06-17 14:31:40.000000000 +0100
+++ offscreen/js/src/configure.in 2009-06-17 14:31:40.000000000 +0100
@@ -880,7 +880,7 @@
--- offscreen.orig/js/src/configure.in 2009-12-09 13:38:51.000000000 +0000
+++ offscreen/js/src/configure.in 2009-12-09 14:14:08.000000000 +0000
@@ -858,7 +858,7 @@
HOST_AR_FLAGS='$(AR_FLAGS)'
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@ -10,12 +10,21 @@ Index: offscreen/js/src/configure.in
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
@@ -3824,7 +3824,7 @@
[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
See --with-nspr-cflags for more details.],
NSPR_LIBS=$withval)
-$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
+NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
Index: offscreen/configure.in
===================================================================
--- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
+++ offscreen/configure.in 2009-06-17 15:10:00.000000000 +0100
@@ -1060,7 +1060,7 @@
--- offscreen.orig/configure.in 2009-12-09 13:38:51.000000000 +0000
+++ offscreen/configure.in 2009-12-09 14:31:33.000000000 +0000
@@ -1041,7 +1041,7 @@
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
@ -24,3 +33,12 @@ Index: offscreen/configure.in
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -8378,7 +8378,7 @@
if test "$BUILD_CTYPES"; then
# Run the libffi 'configure' script on platforms that it supports.
if test -z "$_MSC_VER"; then
- ac_configure_args="--disable-shared --enable-static --disable-raw-api"
+ ac_configure_args="$ac_configure_args --disable-shared --enable-static --disable-raw-api"
if test "$MOZ_DEBUG"; then
ac_configure_args="$ac_configure_args --enable-debug"
fi

38
meta/packages/mozilla-headless/mozilla-headless_hg.bb
View File

@ -2,13 +2,16 @@
FIXEDREV = "${SRCREVMOZILLAHEADLESS}"
#file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
file://configurefix.patch;patch=1 \
file://configurefix-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
file://configurefix.patch;patch=1;notrev=1a622cb7c384 \
file://mozilla-jemalloc.patch;patch=1 \
file://removebadrpath.patch;patch=1 \
file://removebadrpath-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
file://removebadrpath.patch;patch=1;notrev=1a622cb7c384 \
file://buildfixhack.patch;patch=1;notrev=1a622cb7c384 \
file://jsautocfg.h \
file://mozconfig"
PV = "0.2+hg-1.0+${SRCPV}"
PR = "r5"
PR = "r7"
S = "${WORKDIR}/offscreen"
@ -26,6 +29,8 @@ TARGET_CFLAGS = "-Os -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-prote
LDFLAGS = "${TARGET_LDFLAGS}"
TARGET_LDFLAGS = "-Wl,-rpath,${libdir}/xulrunner-1.9.2a1pre"
export target_alias=${TARGET_PREFIX}
inherit autotools_stage mozilla
acpaths = "-I ${S}/build/autoconf "
@ -33,6 +38,13 @@ acpaths = "-I ${S}/build/autoconf "
export topsrcdir = "${S}"
do_configure () {
if [ "${SRCREV}" != "1a622cb7c384" ]; then
rm -rf ${S}/build/autoconf/acwinpaths.m4
rm -rf ${S}/js/src/build/autoconf/acwinpaths.m4
rm -rf ${S}/nsprpub/build/autoconf/acwinpaths.m4
mkdir -p ${S}/js/src/dist/include
ln -fs ../../../../nsprpub/dist/include/nspr ${S}/js/src/dist/include/nsprpub
fi
cp ${S}/build/autoconf/install-sh ${S}
autotools_do_configure
# Yes, we run this twice. The first pass sets up npsrpub-config which then
@ -46,9 +58,11 @@ do_compile () {
base_do_compile
}
XULVERSION = "1.9.3a1pre"
do_install_append () {
install -d ${D}${sysconfdir}/ld.so.conf.d/
echo ${libdir}/xulrunner-1.9.2a1pre/ > ${D}${sysconfdir}/ld.so.conf.d/mozilla-headless
echo ${libdir}/xulrunner-${XULVERSION}/ > ${D}${sysconfdir}/ld.so.conf.d/mozilla-headless
}
EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-headless --with-pthreads \
@ -61,15 +75,19 @@ export LIBXUL_DIST="${S}/dist"
SYSROOT_PREPROCESS_FUNCS += "mozilla_sysroot_preprocess"
mozilla_sysroot_preprocess () {
autotools_stage_dir ${D}/${libdir}/xulrunner-1.9.2a1pre ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/
autotools_stage_dir ${D}/${libdir}/xulrunner-devel-1.9.2a1pre ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/
autotools_stage_dir ${D}/${libdir}/xulrunner-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/
autotools_stage_dir ${D}/${libdir}/xulrunner-devel-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/
ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/bin
ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-1.9.2a1pre/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/idl
ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-1.9.2a1pre/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/include
ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/lib
ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/bin
ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/idl
ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/include
ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/lib
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
install -m 755 ${S}/dist/host/bin/host_xpidl ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/xpidl
}
__anonymous () {
if bb.data.getVar("SRCREV", d, True) == "1a622cb7c384":
bb.data.setVar("XULVERSION", "1.9.2a1pre", d)
}