summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch72
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/configurefix.patch163
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless_hg.bb2
3 files changed, 103 insertions, 134 deletions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch b/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
index b3972e78f7..db9e147990 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
@@ -21,11 +21,11 @@ the clipboard.
21 create mode 100644 widget/src/headless/nsImageToPixbuf.cpp 21 create mode 100644 widget/src/headless/nsImageToPixbuf.cpp
22 create mode 100644 widget/src/headless/nsImageToPixbuf.h 22 create mode 100644 widget/src/headless/nsImageToPixbuf.h
23 23
24diff --git a/widget/src/headless/Makefile.in b/widget/src/headless/Makefile.in 24Index: offscreen/widget/src/headless/Makefile.in
25index c8727d9..cbdf900 100644 25===================================================================
26--- a/widget/src/headless/Makefile.in 26--- offscreen.orig/widget/src/headless/Makefile.in 2009-05-16 18:23:25.000000000 +0100
27+++ b/widget/src/headless/Makefile.in 27+++ offscreen/widget/src/headless/Makefile.in 2009-06-12 14:14:05.000000000 +0100
28@@ -95,6 +95,12 @@ CPPSRCS = \ 28@@ -95,6 +95,12 @@
29 nsScreenManagerHeadless.cpp \ 29 nsScreenManagerHeadless.cpp \
30 $(NULL) 30 $(NULL)
31 31
@@ -38,11 +38,10 @@ index c8727d9..cbdf900 100644
38 # build our subdirs, too 38 # build our subdirs, too
39 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a 39 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
40 40
41diff --git a/widget/src/headless/nsClipboard.cpp b/widget/src/headless/nsClipboard.cpp 41Index: offscreen/widget/src/headless/nsClipboard.cpp
42new file mode 100644 42===================================================================
43index 0000000..72a37fc 43--- /dev/null 1970-01-01 00:00:00.000000000 +0000
44--- /dev/null 44+++ offscreen/widget/src/headless/nsClipboard.cpp 2009-06-12 14:14:05.000000000 +0100
45+++ b/widget/src/headless/nsClipboard.cpp
46@@ -0,0 +1,948 @@ 45@@ -0,0 +1,948 @@
47+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ 46+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
48+/* vim:expandtab:shiftwidth=4:tabstop=4: 47+/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -992,11 +991,10 @@ index 0000000..72a37fc
992+ wait_for_retrieval(clipboard, &context); 991+ wait_for_retrieval(clipboard, &context);
993+ return static_cast<gchar *>(context.data); 992+ return static_cast<gchar *>(context.data);
994+} 993+}
995diff --git a/widget/src/headless/nsClipboard.h b/widget/src/headless/nsClipboard.h 994Index: offscreen/widget/src/headless/nsClipboard.h
996new file mode 100644 995===================================================================
997index 0000000..dc690c0 996--- /dev/null 1970-01-01 00:00:00.000000000 +0000
998--- /dev/null 997+++ offscreen/widget/src/headless/nsClipboard.h 2009-06-12 14:14:05.000000000 +0100
999+++ b/widget/src/headless/nsClipboard.h
1000@@ -0,0 +1,93 @@ 998@@ -0,0 +1,93 @@
1001+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ 999+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
1002+/* vim:expandtab:shiftwidth=4:tabstop=4: 1000+/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1091,11 +1089,10 @@ index 0000000..dc690c0
1091+}; 1089+};
1092+ 1090+
1093+#endif /* __nsClipboard_h_ */ 1091+#endif /* __nsClipboard_h_ */
1094diff --git a/widget/src/headless/nsIImageToPixbuf.h b/widget/src/headless/nsIImageToPixbuf.h 1092Index: offscreen/widget/src/headless/nsIImageToPixbuf.h
1095new file mode 100644 1093===================================================================
1096index 0000000..1c46015 1094--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1097--- /dev/null 1095+++ offscreen/widget/src/headless/nsIImageToPixbuf.h 2009-06-12 14:14:05.000000000 +0100
1098+++ b/widget/src/headless/nsIImageToPixbuf.h
1099@@ -0,0 +1,62 @@ 1096@@ -0,0 +1,62 @@
1100+/* ***** BEGIN LICENSE BLOCK ***** 1097+/* ***** BEGIN LICENSE BLOCK *****
1101+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 1098+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1159,11 +1156,10 @@ index 0000000..1c46015
1159+NS_DEFINE_STATIC_IID_ACCESSOR(nsIImageToPixbuf, NSIIMAGETOPIXBUF_IID) 1156+NS_DEFINE_STATIC_IID_ACCESSOR(nsIImageToPixbuf, NSIIMAGETOPIXBUF_IID)
1160+ 1157+
1161+#endif 1158+#endif
1162diff --git a/widget/src/headless/nsImageToPixbuf.cpp b/widget/src/headless/nsImageToPixbuf.cpp 1159Index: offscreen/widget/src/headless/nsImageToPixbuf.cpp
1163new file mode 100644 1160===================================================================
1164index 0000000..496815c 1161--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1165--- /dev/null 1162+++ offscreen/widget/src/headless/nsImageToPixbuf.cpp 2009-06-12 14:14:05.000000000 +0100
1166+++ b/widget/src/headless/nsImageToPixbuf.cpp
1167@@ -0,0 +1,196 @@ 1163@@ -0,0 +1,196 @@
1168+/* vim:set sw=4 sts=4 et cin: */ 1164+/* vim:set sw=4 sts=4 et cin: */
1169+/* ***** BEGIN LICENSE BLOCK ***** 1165+/* ***** BEGIN LICENSE BLOCK *****
@@ -1361,11 +1357,10 @@ index 0000000..496815c
1361+ 1357+
1362+ return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight); 1358+ return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
1363+} 1359+}
1364diff --git a/widget/src/headless/nsImageToPixbuf.h b/widget/src/headless/nsImageToPixbuf.h 1360Index: offscreen/widget/src/headless/nsImageToPixbuf.h
1365new file mode 100644 1361===================================================================
1366index 0000000..0e3f516 1362--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1367--- /dev/null 1363+++ offscreen/widget/src/headless/nsImageToPixbuf.h 2009-06-12 14:14:05.000000000 +0100
1368+++ b/widget/src/headless/nsImageToPixbuf.h
1369@@ -0,0 +1,71 @@ 1364@@ -0,0 +1,71 @@
1370+/* vim:set sw=4 sts=4 et cin: */ 1365+/* vim:set sw=4 sts=4 et cin: */
1371+/* ***** BEGIN LICENSE BLOCK ***** 1366+/* ***** BEGIN LICENSE BLOCK *****
@@ -1438,10 +1433,10 @@ index 0000000..0e3f516
1438+ { 0x9e, 0x42, 0xb0, 0x5e, 0x5f, 0x06, 0x85, 0xb7 } } 1433+ { 0x9e, 0x42, 0xb0, 0x5e, 0x5f, 0x06, 0x85, 0xb7 } }
1439+ 1434+
1440+#endif 1435+#endif
1441diff --git a/widget/src/headless/nsWidgetFactory.cpp b/widget/src/headless/nsWidgetFactory.cpp 1436Index: offscreen/widget/src/headless/nsWidgetFactory.cpp
1442index eb94333..a215988 100644 1437===================================================================
1443--- a/widget/src/headless/nsWidgetFactory.cpp 1438--- offscreen.orig/widget/src/headless/nsWidgetFactory.cpp 2009-06-12 14:08:56.000000000 +0100
1444+++ b/widget/src/headless/nsWidgetFactory.cpp 1439+++ offscreen/widget/src/headless/nsWidgetFactory.cpp 2009-06-12 14:15:24.000000000 +0100
1445@@ -46,6 +46,10 @@ 1440@@ -46,6 +46,10 @@
1446 #include "nsWindow.h" 1441 #include "nsWindow.h"
1447 #include "nsTransferable.h" 1442 #include "nsTransferable.h"
@@ -1450,10 +1445,10 @@ index eb94333..a215988 100644
1450+#include "nsClipboardHelper.h" 1445+#include "nsClipboardHelper.h"
1451+#include "nsClipboard.h" 1446+#include "nsClipboard.h"
1452+#endif 1447+#endif
1453 //#include "nsFilePicker.h"
1454 #include "nsSound.h" 1448 #include "nsSound.h"
1455 #include "nsBidiKeyboard.h" 1449 #include "nsBidiKeyboard.h"
1456@@ -74,6 +78,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel) 1450 #include "nsScreenManagerHeadless.h"
1451@@ -66,6 +70,10 @@
1457 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) 1452 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
1458 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) 1453 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
1459 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) 1454 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
@@ -1464,7 +1459,7 @@ index eb94333..a215988 100644
1464 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound) 1459 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
1465 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerHeadless) 1460 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerHeadless)
1466 //NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf) 1461 //NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf)
1467@@ -189,6 +197,16 @@ static const nsModuleComponentInfo components[] = 1462@@ -142,6 +150,16 @@
1468 NS_TRANSFERABLE_CID, 1463 NS_TRANSFERABLE_CID,
1469 "@mozilla.org/widget/transferable;1", 1464 "@mozilla.org/widget/transferable;1",
1470 nsTransferableConstructor }, 1465 nsTransferableConstructor },
@@ -1481,6 +1476,3 @@ index eb94333..a215988 100644
1481 { "HTML Format Converter", 1476 { "HTML Format Converter",
1482 NS_HTMLFORMATCONVERTER_CID, 1477 NS_HTMLFORMATCONVERTER_CID,
1483 "@mozilla.org/widget/htmlformatconverter;1", 1478 "@mozilla.org/widget/htmlformatconverter;1",
1484--
14851.6.0.4
1486
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
index e02e4af2b6..3345dbb13d 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
@@ -1,7 +1,7 @@
1Index: offscreen/configure.in 1Index: offscreen/configure.in
2=================================================================== 2===================================================================
3--- offscreen.orig/configure.in 2009-04-16 22:51:48.000000000 +0100 3--- offscreen.orig/configure.in 2009-06-12 14:08:51.000000000 +0100
4+++ offscreen/configure.in 2009-04-16 23:07:48.000000000 +0100 4+++ offscreen/configure.in 2009-06-12 14:11:18.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: offscreen/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@@ -136,6 +134,9 @@ 21@@ -135,6 +133,9 @@
22 22
23 MSMANIFEST_TOOL= 23 MSMANIFEST_TOOL=
24 24
@@ -28,7 +28,7 @@ Index: offscreen/configure.in
28 dnl Set various checks 28 dnl Set various checks
29 dnl ======================================================== 29 dnl ========================================================
30 MISSING_X= 30 MISSING_X=
31@@ -281,7 +282,7 @@ 31@@ -285,7 +286,7 @@
32 ;; 32 ;;
33 esac 33 esac
34 34
@@ -37,7 +37,7 @@ Index: offscreen/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@@ -319,7 +320,7 @@ 40@@ -323,7 +324,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: offscreen/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@@ -327,7 +328,7 @@ 49@@ -331,7 +332,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: offscreen/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@@ -348,7 +349,7 @@ 58@@ -352,7 +353,7 @@
59 ;; 59 ;;
60 esac 60 esac
61 61
@@ -64,7 +64,7 @@ Index: offscreen/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@@ -372,37 +373,6 @@ 67@@ -376,37 +377,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)
@@ -102,7 +102,7 @@ Index: offscreen/configure.in
102 102
103 GNU_AS= 103 GNU_AS=
104 GNU_LD= 104 GNU_LD=
105@@ -1569,6 +1539,7 @@ 105@@ -1606,6 +1576,7 @@
106 ' 106 '
107 107
108 dnl test that the macros actually work: 108 dnl test that the macros actually work:
@@ -110,7 +110,7 @@ Index: offscreen/configure.in
110 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)
111 AC_CACHE_VAL(ac_cv_static_assertion_macros_work, 111 AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
112 [AC_LANG_SAVE 112 [AC_LANG_SAVE
113@@ -2730,9 +2701,13 @@ 113@@ -2767,9 +2738,13 @@
114 AC_LANG_C 114 AC_LANG_C
115 AC_HEADER_STDC 115 AC_HEADER_STDC
116 AC_C_CONST 116 AC_C_CONST
@@ -124,7 +124,7 @@ Index: offscreen/configure.in
124 AC_TYPE_SIZE_T 124 AC_TYPE_SIZE_T
125 AC_STRUCT_ST_BLKSIZE 125 AC_STRUCT_ST_BLKSIZE
126 AC_MSG_CHECKING(for siginfo_t) 126 AC_MSG_CHECKING(for siginfo_t)
127@@ -3115,19 +3090,9 @@ 127@@ -3152,19 +3127,9 @@
128 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
129 dnl they both are just symlinks to libSystem and explicitly linking 129 dnl they both are just symlinks to libSystem and explicitly linking
130 dnl against libSystem causes issues when debugging (see bug 299601). 130 dnl against libSystem causes issues when debugging (see bug 299601).
@@ -145,7 +145,7 @@ Index: offscreen/configure.in
145 145
146 _SAVE_CFLAGS="$CFLAGS" 146 _SAVE_CFLAGS="$CFLAGS"
147 CFLAGS="$CFLAGS -D_GNU_SOURCE" 147 CFLAGS="$CFLAGS -D_GNU_SOURCE"
148@@ -6931,18 +6896,13 @@ 148@@ -7007,18 +6972,13 @@
149 149
150 # Demangle only for debug or trace-malloc builds 150 # Demangle only for debug or trace-malloc builds
151 MOZ_DEMANGLE_SYMBOLS= 151 MOZ_DEMANGLE_SYMBOLS=
@@ -166,7 +166,7 @@ Index: offscreen/configure.in
166 166
167 dnl ======================================================== 167 dnl ========================================================
168 dnl = 168 dnl =
169@@ -7454,10 +7414,7 @@ 169@@ -7530,10 +7490,7 @@
170 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
171 dnl to either libIDL1 or libIDL2. 171 dnl to either libIDL1 or libIDL2.
172 if test -z "$_LIBIDL_FOUND"; then 172 if test -z "$_LIBIDL_FOUND"; then
@@ -177,7 +177,7 @@ Index: offscreen/configure.in
177 fi 177 fi
178 dnl 178 dnl
179 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,
180@@ -7529,13 +7486,7 @@ 180@@ -7605,13 +7562,7 @@
181 fi 181 fi
182 182
183 if test -z "$SKIP_PATH_CHECKS"; then 183 if test -z "$SKIP_PATH_CHECKS"; then
@@ -191,7 +191,7 @@ Index: offscreen/configure.in
191 fi 191 fi
192 192
193 if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then 193 if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
194@@ -8346,10 +8297,7 @@ 194@@ -8457,10 +8408,7 @@
195 HAVE_WCRTOMB 195 HAVE_WCRTOMB
196 " 196 "
197 197
@@ -203,7 +203,7 @@ Index: offscreen/configure.in
203 ) 203 )
204 204
205 # Save the defines header file before autoconf removes it. 205 # Save the defines header file before autoconf removes it.
206@@ -8408,31 +8356,11 @@ 206@@ -8519,31 +8467,11 @@
207 dnl To add new Makefiles, edit allmakefiles.sh. 207 dnl To add new Makefiles, edit allmakefiles.sh.
208 dnl allmakefiles.sh sets the variable, MAKEFILES. 208 dnl allmakefiles.sh sets the variable, MAKEFILES.
209 . ${srcdir}/allmakefiles.sh 209 . ${srcdir}/allmakefiles.sh
@@ -235,7 +235,7 @@ Index: offscreen/configure.in
235 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
236 if test "$CAIRO_FEATURES_H"; then 236 if test "$CAIRO_FEATURES_H"; then
237 if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then 237 if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
238@@ -8458,14 +8386,14 @@ 238@@ -8569,14 +8497,14 @@
239 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS" 239 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
240 RC= 240 RC=
241 241
@@ -253,7 +253,7 @@ Index: offscreen/configure.in
253 if test -z "$MOZ_DEBUG"; then 253 if test -z "$MOZ_DEBUG"; then
254 ac_configure_args="$ac_configure_args --disable-debug" 254 ac_configure_args="$ac_configure_args --disable-debug"
255 fi 255 fi
256@@ -8481,8 +8409,7 @@ 256@@ -8592,8 +8520,7 @@
257 if test -n "$USE_ARM_KUSER"; then 257 if test -n "$USE_ARM_KUSER"; then
258 ac_configure_args="$ac_configure_args --with-arm-kuser" 258 ac_configure_args="$ac_configure_args --with-arm-kuser"
259 fi 259 fi
@@ -263,7 +263,7 @@ Index: offscreen/configure.in
263 fi 263 fi
264 264
265 if test -z "$MOZ_NATIVE_NSPR"; then 265 if test -z "$MOZ_NATIVE_NSPR"; then
266@@ -8499,7 +8426,6 @@ 266@@ -8610,7 +8537,6 @@
267 267
268 # Run the SpiderMonkey 'configure' script. 268 # Run the SpiderMonkey 'configure' script.
269 dist=$MOZ_BUILD_ROOT/dist 269 dist=$MOZ_BUILD_ROOT/dist
@@ -271,9 +271,9 @@ Index: offscreen/configure.in
271 ac_configure_args="$ac_configure_args --enable-threadsafe" 271 ac_configure_args="$ac_configure_args --enable-threadsafe"
272 if test -z "$MOZ_NATIVE_NSPR"; then 272 if test -z "$MOZ_NATIVE_NSPR"; then
273 ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" 273 ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
274@@ -8513,11 +8439,14 @@ 274@@ -8627,11 +8553,14 @@
275 if test "$MOZ_MEMORY"; then 275 export MOZ_MEMORY_LDFLAGS
276 ac_configure_args="$ac_configure_args --enable-jemalloc" 276 fi
277 fi 277 fi
278-AC_OUTPUT_SUBDIRS(js/src) 278-AC_OUTPUT_SUBDIRS(js/src)
279-ac_configure_args="$_SUBDIR_CONFIG_ARGS" 279-ac_configure_args="$_SUBDIR_CONFIG_ARGS"
@@ -290,8 +290,8 @@ Index: offscreen/configure.in
290 if cmp -s config/autoconf.mk config/autoconf.mk.orig; then 290 if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
291Index: offscreen/js/src/configure.in 291Index: offscreen/js/src/configure.in
292=================================================================== 292===================================================================
293--- offscreen.orig/js/src/configure.in 2009-04-16 22:51:49.000000000 +0100 293--- offscreen.orig/js/src/configure.in 2009-06-12 14:08:52.000000000 +0100
294+++ offscreen/js/src/configure.in 2009-04-16 23:06:42.000000000 +0100 294+++ offscreen/js/src/configure.in 2009-06-12 14:11:18.000000000 +0100
295@@ -62,7 +62,6 @@ 295@@ -62,7 +62,6 @@
296 296
297 AC_PREREQ(2.13) 297 AC_PREREQ(2.13)
@@ -310,7 +310,7 @@ Index: offscreen/js/src/configure.in
310 dnl Set the version number of the libs included with mozilla 310 dnl Set the version number of the libs included with mozilla
311 dnl ======================================================== 311 dnl ========================================================
312 NSPR_VERSION=4 312 NSPR_VERSION=4
313@@ -114,6 +116,8 @@ 313@@ -113,6 +115,8 @@
314 314
315 MSMANIFEST_TOOL= 315 MSMANIFEST_TOOL=
316 316
@@ -319,7 +319,7 @@ Index: offscreen/js/src/configure.in
319 dnl Set various checks 319 dnl Set various checks
320 dnl ======================================================== 320 dnl ========================================================
321 MISSING_X= 321 MISSING_X=
322@@ -200,7 +204,7 @@ 322@@ -198,7 +202,7 @@
323 323
324 if test "$COMPILE_ENVIRONMENT"; then 324 if test "$COMPILE_ENVIRONMENT"; then
325 325
@@ -328,7 +328,7 @@ Index: offscreen/js/src/configure.in
328 echo "cross compiling from $host to $target" 328 echo "cross compiling from $host to $target"
329 329
330 _SAVE_CC="$CC" 330 _SAVE_CC="$CC"
331@@ -237,7 +241,7 @@ 331@@ -235,7 +239,7 @@
332 332
333 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])
334 AC_TRY_COMPILE([], [return(0);], 334 AC_TRY_COMPILE([], [return(0);],
@@ -337,7 +337,7 @@ Index: offscreen/js/src/configure.in
337 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.]) )
338 338
339 CC="$HOST_CXX" 339 CC="$HOST_CXX"
340@@ -245,7 +249,7 @@ 340@@ -243,7 +247,7 @@
341 341
342 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])
343 AC_TRY_COMPILE([], [return(0);], 343 AC_TRY_COMPILE([], [return(0);],
@@ -346,7 +346,7 @@ Index: offscreen/js/src/configure.in
346 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.]) )
347 347
348 CC=$_SAVE_CC 348 CC=$_SAVE_CC
349@@ -266,7 +270,7 @@ 349@@ -298,7 +302,7 @@
350 ;; 350 ;;
351 esac 351 esac
352 352
@@ -355,7 +355,7 @@ Index: offscreen/js/src/configure.in
355 unset ac_cv_prog_CC 355 unset ac_cv_prog_CC
356 AC_PROG_CC 356 AC_PROG_CC
357 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :) 357 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
358@@ -296,37 +300,6 @@ 358@@ -328,37 +332,6 @@
359 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
360 dnl compiler appear native. So we override that here. 360 dnl compiler appear native. So we override that here.
361 cross_compiling=yes 361 cross_compiling=yes
@@ -393,7 +393,7 @@ Index: offscreen/js/src/configure.in
393 393
394 GNU_AS= 394 GNU_AS=
395 GNU_LD= 395 GNU_LD=
396@@ -1435,6 +1408,8 @@ 396@@ -1424,6 +1397,8 @@
397 fi # GNU_CC 397 fi # GNU_CC
398 fi # COMPILE_ENVIRONMENT 398 fi # COMPILE_ENVIRONMENT
399 399
@@ -402,7 +402,7 @@ Index: offscreen/js/src/configure.in
402 dnl ================================================================= 402 dnl =================================================================
403 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,
404 dnl which is bad when cross compiling. 404 dnl which is bad when cross compiling.
405@@ -2565,9 +2540,13 @@ 405@@ -2579,9 +2554,13 @@
406 AC_LANG_C 406 AC_LANG_C
407 AC_HEADER_STDC 407 AC_HEADER_STDC
408 AC_C_CONST 408 AC_C_CONST
@@ -416,7 +416,7 @@ Index: offscreen/js/src/configure.in
416 AC_TYPE_SIZE_T 416 AC_TYPE_SIZE_T
417 AC_STRUCT_ST_BLKSIZE 417 AC_STRUCT_ST_BLKSIZE
418 AC_MSG_CHECKING(for siginfo_t) 418 AC_MSG_CHECKING(for siginfo_t)
419@@ -2592,7 +2571,8 @@ 419@@ -2606,7 +2585,8 @@
420 420
421 AC_CHECK_HEADER(stdint.h) 421 AC_CHECK_HEADER(stdint.h)
422 if test "$ac_cv_header_stdint_h" = yes; then 422 if test "$ac_cv_header_stdint_h" = yes; then
@@ -426,7 +426,7 @@ Index: offscreen/js/src/configure.in
426 else 426 else
427 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
428 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
429@@ -2990,10 +2970,7 @@ 429@@ -3004,10 +2984,7 @@
430 ;; 430 ;;
431 *) 431 *)
432 AC_CHECK_LIB(m, atan) 432 AC_CHECK_LIB(m, atan)
@@ -438,7 +438,7 @@ Index: offscreen/js/src/configure.in
438 ;; 438 ;;
439 esac 439 esac
440 440
441@@ -3908,6 +3885,7 @@ 441@@ -3903,6 +3880,7 @@
442 [ --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.
443 See --with-nspr-cflags for more details.], 443 See --with-nspr-cflags for more details.],
444 NSPR_LIBS=$withval) 444 NSPR_LIBS=$withval)
@@ -446,7 +446,7 @@ Index: offscreen/js/src/configure.in
446 AC_SUBST(NSPR_CFLAGS) 446 AC_SUBST(NSPR_CFLAGS)
447 AC_SUBST(NSPR_LIBS) 447 AC_SUBST(NSPR_LIBS)
448 448
449@@ -4542,18 +4520,11 @@ 449@@ -4512,18 +4490,11 @@
450 450
451 # Demangle only for debug or trace-malloc builds 451 # Demangle only for debug or trace-malloc builds
452 MOZ_DEMANGLE_SYMBOLS= 452 MOZ_DEMANGLE_SYMBOLS=
@@ -465,7 +465,7 @@ Index: offscreen/js/src/configure.in
465 465
466 dnl ======================================================== 466 dnl ========================================================
467 dnl = 467 dnl =
468@@ -5256,6 +5227,8 @@ 468@@ -5231,6 +5202,8 @@
469 done 469 done
470 AC_SUBST(LIBS_PATH) 470 AC_SUBST(LIBS_PATH)
471 471
@@ -474,15 +474,15 @@ Index: offscreen/js/src/configure.in
474 dnl ======================================================== 474 dnl ========================================================
475 dnl JavaScript shell 475 dnl JavaScript shell
476 dnl ======================================================== 476 dnl ========================================================
477@@ -5396,3 +5369,4 @@ 477@@ -5371,3 +5344,4 @@
478 # 'js-config' in Makefile.in. 478 # 'js-config' in Makefile.in.
479 AC_MSG_RESULT(invoking make to create js-config script) 479 AC_MSG_RESULT(invoking make to create js-config script)
480 $MAKE js-config 480 $MAKE js-config
481+ 481+
482Index: offscreen/nsprpub/configure.in 482Index: offscreen/nsprpub/configure.in
483=================================================================== 483===================================================================
484--- offscreen.orig/nsprpub/configure.in 2009-04-16 18:09:00.000000000 +0100 484--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:08:54.000000000 +0100
485+++ offscreen/nsprpub/configure.in 2009-04-16 23:06:42.000000000 +0100 485+++ offscreen/nsprpub/configure.in 2009-06-12 14:11:18.000000000 +0100
486@@ -42,7 +42,6 @@ 486@@ -42,7 +42,6 @@
487 AC_PREREQ(2.12) 487 AC_PREREQ(2.12)
488 AC_INIT(config/libc_r.h) 488 AC_INIT(config/libc_r.h)
@@ -491,7 +491,7 @@ Index: offscreen/nsprpub/configure.in
491 AC_CANONICAL_SYSTEM 491 AC_CANONICAL_SYSTEM
492 492
493 dnl ======================================================== 493 dnl ========================================================
494@@ -400,7 +399,7 @@ 494@@ -396,7 +395,7 @@
495 dnl ======================================================== 495 dnl ========================================================
496 dnl Checks for compilers. 496 dnl Checks for compilers.
497 dnl ======================================================== 497 dnl ========================================================
@@ -500,7 +500,7 @@ Index: offscreen/nsprpub/configure.in
500 echo "cross compiling from $host to $target" 500 echo "cross compiling from $host to $target"
501 cross_compiling=yes 501 cross_compiling=yes
502 502
503@@ -427,7 +426,7 @@ 503@@ -423,7 +422,7 @@
504 504
505 AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) 505 AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
506 AC_TRY_COMPILE([], [return(0);], 506 AC_TRY_COMPILE([], [return(0);],
@@ -509,7 +509,7 @@ Index: offscreen/nsprpub/configure.in
509 AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) ) 509 AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
510 510
511 CC=$_SAVE_CC 511 CC=$_SAVE_CC
512@@ -448,7 +447,7 @@ 512@@ -444,7 +443,7 @@
513 ;; 513 ;;
514 esac 514 esac
515 515
@@ -518,7 +518,7 @@ Index: offscreen/nsprpub/configure.in
518 unset ac_cv_prog_CC 518 unset ac_cv_prog_CC
519 AC_PROG_CC 519 AC_PROG_CC
520 if test -n "$USE_CPLUS"; then 520 if test -n "$USE_CPLUS"; then
521@@ -474,30 +473,6 @@ 521@@ -470,30 +469,6 @@
522 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo) 522 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
523 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo) 523 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
524 524
@@ -549,7 +549,7 @@ Index: offscreen/nsprpub/configure.in
549 if test "$GCC" = "yes"; then 549 if test "$GCC" = "yes"; then
550 GNU_CC=1 550 GNU_CC=1
551 fi 551 fi
552@@ -518,11 +493,8 @@ 552@@ -514,11 +489,8 @@
553 ;; 553 ;;
554 esac 554 esac
555 555
@@ -562,7 +562,7 @@ Index: offscreen/nsprpub/configure.in
562 562
563 dnl ======================================================== 563 dnl ========================================================
564 dnl Check for gcc -pipe support 564 dnl Check for gcc -pipe support
565@@ -2249,10 +2221,7 @@ 565@@ -2283,10 +2255,7 @@
566 *-darwin*|*-beos*) 566 *-darwin*|*-beos*)
567 ;; 567 ;;
568 *) 568 *)
@@ -574,7 +574,7 @@ Index: offscreen/nsprpub/configure.in
574 esac 574 esac
575 575
576 576
577@@ -2869,6 +2838,8 @@ 577@@ -2904,6 +2873,8 @@
578 dnl pr/tests/w16gui/Makefile 578 dnl pr/tests/w16gui/Makefile
579 dnl tools/Makefile 579 dnl tools/Makefile
580 580
@@ -583,29 +583,17 @@ Index: offscreen/nsprpub/configure.in
583 if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then 583 if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
584 MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile" 584 MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
585 elif test -n "$USE_PTHREADS"; then 585 elif test -n "$USE_PTHREADS"; then
586@@ -2884,3 +2855,5 @@ 586@@ -2919,3 +2890,5 @@
587 echo $MAKEFILES > unallmakefiles 587 echo $MAKEFILES > unallmakefiles
588 588
589 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config]) 589 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
590+ 590+
591+ 591+
592Index: offscreen/toolkit/toolkit-makefiles.sh
593===================================================================
594--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-04-16 22:51:50.000000000 +0100
595+++ offscreen/toolkit/toolkit-makefiles.sh 2009-04-16 23:06:42.000000000 +0100
596@@ -628,7 +628,6 @@
597 toolkit/crashreporter/client/Makefile
598 toolkit/crashreporter/google-breakpad/src/client/Makefile
599 toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile
600- toolkit/crashreporter/google-breakpad/src/client/windows/Makefile
601 toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile
602 toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile
603 toolkit/crashreporter/google-breakpad/src/common/Makefile
604Index: offscreen/js/src/Makefile.in 592Index: offscreen/js/src/Makefile.in
605=================================================================== 593===================================================================
606--- offscreen.orig/js/src/Makefile.in 2009-04-16 18:07:56.000000000 +0100 594--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:08:52.000000000 +0100
607+++ offscreen/js/src/Makefile.in 2009-04-16 23:06:42.000000000 +0100 595+++ offscreen/js/src/Makefile.in 2009-06-12 14:11:18.000000000 +0100
608@@ -507,20 +507,8 @@ 596@@ -514,20 +514,8 @@
609 597
610 export:: jsautocfg.h 598 export:: jsautocfg.h
611 599
@@ -626,7 +614,7 @@ Index: offscreen/js/src/Makefile.in
626 614
627 # jscpucfg is a strange target 615 # jscpucfg is a strange target
628 # Needs to be built with the host compiler but needs to include 616 # Needs to be built with the host compiler but needs to include
629@@ -550,7 +538,7 @@ 617@@ -557,7 +545,7 @@
630 echo no need to build jscpucfg $< 618 echo no need to build jscpucfg $<
631 else 619 else
632 jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in 620 jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
@@ -637,8 +625,8 @@ Index: offscreen/js/src/Makefile.in
637 625
638Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 626Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
639=================================================================== 627===================================================================
640--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-04-16 18:08:00.000000000 +0100 628--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:08:52.000000000 +0100
641+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-04-16 23:06:42.000000000 +0100 629+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:11:18.000000000 +0100
642@@ -47,6 +47,8 @@ 630@@ -47,6 +47,8 @@
643 631
644 #include <stdarg.h> 632 #include <stdarg.h>
@@ -651,7 +639,7 @@ Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
651Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 639Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
652=================================================================== 640===================================================================
653--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 18:08:00.000000000 +0100 641--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 18:08:00.000000000 +0100
654+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 23:06:42.000000000 +0100 642+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:11:18.000000000 +0100
655@@ -39,6 +39,8 @@ 643@@ -39,6 +39,8 @@
656 * 644 *
657 * ***** END LICENSE BLOCK ***** */ 645 * ***** END LICENSE BLOCK ***** */
@@ -664,7 +652,7 @@ Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
664Index: offscreen/modules/lcms/include/icc34.h 652Index: offscreen/modules/lcms/include/icc34.h
665=================================================================== 653===================================================================
666--- offscreen.orig/modules/lcms/include/icc34.h 2009-04-16 18:08:47.000000000 +0100 654--- offscreen.orig/modules/lcms/include/icc34.h 2009-04-16 18:08:47.000000000 +0100
667+++ offscreen/modules/lcms/include/icc34.h 2009-04-16 23:06:42.000000000 +0100 655+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:11:18.000000000 +0100
668@@ -144,7 +144,7 @@ 656@@ -144,7 +144,7 @@
669 */ 657 */
670 658
@@ -676,9 +664,9 @@ Index: offscreen/modules/lcms/include/icc34.h
676 Added the stupid check for autoconf by Marti Maria. 664 Added the stupid check for autoconf by Marti Maria.
677Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in 665Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
678=================================================================== 666===================================================================
679--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-04-16 18:09:35.000000000 +0100 667--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:08:56.000000000 +0100
680+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-04-16 23:06:42.000000000 +0100 668+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:11:18.000000000 +0100
681@@ -59,7 +59,7 @@ 669@@ -60,7 +60,7 @@
682 670
683 LIBS += \ 671 LIBS += \
684 $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ 672 $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
@@ -690,7 +678,7 @@ Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
690Index: offscreen/xpcom/sample/program/Makefile.in 678Index: offscreen/xpcom/sample/program/Makefile.in
691=================================================================== 679===================================================================
692--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-04-16 18:09:47.000000000 +0100 680--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-04-16 18:09:47.000000000 +0100
693+++ offscreen/xpcom/sample/program/Makefile.in 2009-04-16 23:06:42.000000000 +0100 681+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:11:18.000000000 +0100
694@@ -57,7 +57,7 @@ 682@@ -57,7 +57,7 @@
695 # that the application be linked against the XPCOM dynamic library or the NSPR 683 # that the application be linked against the XPCOM dynamic library or the NSPR
696 # dynamic libraries. 684 # dynamic libraries.
@@ -703,7 +691,7 @@ Index: offscreen/xpcom/sample/program/Makefile.in
703Index: offscreen/xpcom/tools/registry/Makefile.in 691Index: offscreen/xpcom/tools/registry/Makefile.in
704=================================================================== 692===================================================================
705--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-04-16 18:09:48.000000000 +0100 693--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-04-16 18:09:48.000000000 +0100
706+++ offscreen/xpcom/tools/registry/Makefile.in 2009-04-16 23:06:42.000000000 +0100 694+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:11:18.000000000 +0100
707@@ -54,7 +54,7 @@ 695@@ -54,7 +54,7 @@
708 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) 696 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
709 697
@@ -715,9 +703,9 @@ Index: offscreen/xpcom/tools/registry/Makefile.in
715 # Need to link with CoreFoundation on Mac 703 # Need to link with CoreFoundation on Mac
716Index: offscreen/xulrunner/app/Makefile.in 704Index: offscreen/xulrunner/app/Makefile.in
717=================================================================== 705===================================================================
718--- offscreen.orig/xulrunner/app/Makefile.in 2009-04-16 18:09:50.000000000 +0100 706--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:08:56.000000000 +0100
719+++ offscreen/xulrunner/app/Makefile.in 2009-04-16 23:06:42.000000000 +0100 707+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:11:18.000000000 +0100
720@@ -180,7 +180,7 @@ 708@@ -184,7 +184,7 @@
721 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" 709 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
722 endif 710 endif
723 711
@@ -729,7 +717,7 @@ Index: offscreen/xulrunner/app/Makefile.in
729Index: offscreen/xulrunner/stub/Makefile.in 717Index: offscreen/xulrunner/stub/Makefile.in
730=================================================================== 718===================================================================
731--- offscreen.orig/xulrunner/stub/Makefile.in 2009-04-16 18:09:50.000000000 +0100 719--- offscreen.orig/xulrunner/stub/Makefile.in 2009-04-16 18:09:50.000000000 +0100
732+++ offscreen/xulrunner/stub/Makefile.in 2009-04-16 23:06:42.000000000 +0100 720+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:11:18.000000000 +0100
733@@ -101,7 +101,7 @@ 721@@ -101,7 +101,7 @@
734 endif 722 endif
735 endif 723 endif
@@ -741,8 +729,8 @@ Index: offscreen/xulrunner/stub/Makefile.in
741 729
742Index: offscreen/modules/plugin/test/testplugin/Makefile.in 730Index: offscreen/modules/plugin/test/testplugin/Makefile.in
743=================================================================== 731===================================================================
744--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-04-16 18:08:56.000000000 +0100 732--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:08:54.000000000 +0100
745+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-04-16 23:06:42.000000000 +0100 733+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:11:18.000000000 +0100
746@@ -63,9 +63,7 @@ 734@@ -63,9 +63,7 @@
747 CMMSRCS = nptest_macosx.mm 735 CMMSRCS = nptest_macosx.mm
748 endif 736 endif
@@ -751,23 +739,12 @@ Index: offscreen/modules/plugin/test/testplugin/Makefile.in
751 CPPSRCS += nptest_gtk2.cpp 739 CPPSRCS += nptest_gtk2.cpp
752-endif 740-endif
753 741
754 ifeq ($(MOZ_WIDGET_TOOLKIT),qt) 742 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
755 CPPSRCS += nptest_qt.cpp 743 CPPSRCS += nptest_os2.cpp
756Index: offscreen/xulrunner/installer/libxul-unstable.pc.in
757===================================================================
758--- offscreen.orig/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 18:09:50.000000000 +0100
759+++ offscreen/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 23:06:42.000000000 +0100
760@@ -8,5 +8,5 @@
761 Description: The Mozilla Runtime and Embedding Engine (unstable API)
762 Version: %MOZILLA_VERSION%
763 Requires: %NSPR_NAME% >= %NSPR_VERSION%
764-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
765+Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -lsmime3 -lnss3 -lssl3 -lnssutil3 -L${sdkdir}/../xulrunner-1.9.2a1pre
766 Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
767Index: offscreen/js/src/aclocal.m4 744Index: offscreen/js/src/aclocal.m4
768=================================================================== 745===================================================================
769--- offscreen.orig/js/src/aclocal.m4 2009-04-16 18:07:56.000000000 +0100 746--- 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 747+++ offscreen/js/src/aclocal.m4 2009-06-12 14:11:18.000000000 +0100
771@@ -9,4 +9,3 @@ 748@@ -9,4 +9,3 @@
772 builtin(include, build/autoconf/moznbytetype.m4)dnl 749 builtin(include, build/autoconf/moznbytetype.m4)dnl
773 builtin(include, build/autoconf/mozprog.m4)dnl 750 builtin(include, build/autoconf/mozprog.m4)dnl
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index aadd7aec73..e2a3d99dcf 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/offscreen"
14 14
15DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl" 15DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
16 16
17FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre" 17FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre ${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/*.so"
18FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre" 18FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre"
19FILES_${PN}-dbg += "${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/.debug" 19FILES_${PN}-dbg += "${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/.debug"
20 20
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-04 23:18:48 +0000