summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-02 19:54:56 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-02 19:54:56 +0000
commit28a8d1503cf246a63285e96c953f20ac0c832d34 (patch)
tree761e2b2c8b35a5f9e148753267a920a67019e642 /meta
parent4d80441aaef86f264fac1927b1db67ebaa12077d (diff)
downloadpoky-28a8d1503cf246a63285e96c953f20ac0c832d34.tar.gz
mozilla-headless: Add missing autoconf patch hunk
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch41
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless_hg.bb2
2 files changed, 38 insertions, 5 deletions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch b/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
index dad90771d0..2874b0d832 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
@@ -4,8 +4,8 @@ RP 2/2/10
4 4
5Index: offscreen/js/ctypes/libffi/configure.ac 5Index: offscreen/js/ctypes/libffi/configure.ac
6=================================================================== 6===================================================================
7--- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-01 14:25:48.859064666 +0000 7--- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-02 19:53:16.753906134 +0000
8+++ offscreen/js/ctypes/libffi/configure.ac 2010-02-01 14:26:54.097792073 +0000 8+++ offscreen/js/ctypes/libffi/configure.ac 2010-02-02 19:53:21.895155509 +0000
9@@ -17,10 +17,10 @@ 9@@ -17,10 +17,10 @@
10 # the wrong, non-multilib-adjusted value will be used in multilibs. 10 # the wrong, non-multilib-adjusted value will be used in multilibs.
11 # As a side effect, we have to subst CFLAGS ourselves. 11 # As a side effect, we have to subst CFLAGS ourselves.
@@ -21,8 +21,8 @@ Index: offscreen/js/ctypes/libffi/configure.ac
21 21
22Index: offscreen/modules/libpr0n/build/Makefile.in 22Index: offscreen/modules/libpr0n/build/Makefile.in
23=================================================================== 23===================================================================
24--- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-01-14 12:06:49.000000000 +0000 24--- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:16.783906873 +0000
25+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 16:58:01.177764887 +0000 25+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000
26@@ -92,6 +92,7 @@ 26@@ -92,6 +92,7 @@
27 27
28 export:: 28 export::
@@ -31,3 +31,36 @@ Index: offscreen/modules/libpr0n/build/Makefile.in
31 $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \ 31 $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
32 echo "#define IMG_BUILD_DECODER_${d}";) \ 32 echo "#define IMG_BUILD_DECODER_${d}";) \
33 $(foreach d,$(MOZ_IMG_ENCODERS), \ 33 $(foreach d,$(MOZ_IMG_ENCODERS), \
34Index: offscreen/configure.in
35===================================================================
36--- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000
37+++ offscreen/configure.in 2010-02-02 16:33:09.000000000 +0000
38@@ -3250,11 +3250,7 @@
39 dnl ========================================================
40 AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
41 $XLIBS $XEXT_LIBS)
42- AC_CHECK_HEADER(X11/extensions/XShm.h)
43- if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
44- test -n "$_HAVE_XSHM_XEXT"; then
45- AC_DEFINE(HAVE_XSHM)
46- fi
47+ AC_DEFINE(HAVE_XSHM)
48
49 dnl ========================================================
50 dnl = Check for XIE
51@@ -8120,15 +8116,7 @@
52 fi # COMPILE_ENVIRONMENT
53
54 if test "$USE_FC_FREETYPE"; then
55- if test "$COMPILE_ENVIRONMENT"; then
56- _SAVE_CPPFLAGS="$CPPFLAGS"
57- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
58- AC_CHECK_HEADERS(fontconfig/fcfreetype.h, ,
59- [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
60- CPPFLAGS="$_SAVE_CPPFLAGS"
61- else
62 AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
63- fi
64 fi
65
66 dnl Set various defines and substitutions
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index 5ebe1a4876..c61f8de8e1 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -12,7 +12,7 @@ SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
12 file://jsautocfg.h \ 12 file://jsautocfg.h \
13 file://mozconfig" 13 file://mozconfig"
14PV = "0.2+hg-1.0+${SRCPV}" 14PV = "0.2+hg-1.0+${SRCPV}"
15PR = "r9" 15PR = "r10"
16 16
17S = "${WORKDIR}/offscreen" 17S = "${WORKDIR}/offscreen"
18 18