summaryrefslogtreecommitdiff
path: root/meta/packages
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/packages
parent4d80441aaef86f264fac1927b1db67ebaa12077d (diff)
downloadopenembedded-core-28a8d1503cf246a63285e96c953f20ac0c832d34.tar.gz
openembedded-core-28a8d1503cf246a63285e96c953f20ac0c832d34.tar.bz2
openembedded-core-28a8d1503cf246a63285e96c953f20ac0c832d34.tar.xz
openembedded-core-28a8d1503cf246a63285e96c953f20ac0c832d34.zip
mozilla-headless: Add missing autoconf patch hunk
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-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 dad90771d..2874b0d83 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
Index: offscreen/js/ctypes/libffi/configure.ac
===================================================================
---- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-01 14:25:48.859064666 +0000
-+++ offscreen/js/ctypes/libffi/configure.ac 2010-02-01 14:26:54.097792073 +0000
+--- offscreen.orig/js/ctypes/libffi/configure.ac 2010-02-02 19:53:16.753906134 +0000
++++ offscreen/js/ctypes/libffi/configure.ac 2010-02-02 19:53:21.895155509 +0000
@@ -17,10 +17,10 @@
# the wrong, non-multilib-adjusted value will be used in multilibs.
# As a side effect, we have to subst CFLAGS ourselves.
@@ -21,8 +21,8 @@ Index: offscreen/js/ctypes/libffi/configure.ac
Index: offscreen/modules/libpr0n/build/Makefile.in
===================================================================
---- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-01-14 12:06:49.000000000 +0000
-+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 16:58:01.177764887 +0000
+--- offscreen.orig/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:16.783906873 +0000
++++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000
@@ -92,6 +92,7 @@
export::
@@ -31,3 +31,36 @@ Index: offscreen/modules/libpr0n/build/Makefile.in
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
echo "#define IMG_BUILD_DECODER_${d}";) \
$(foreach d,$(MOZ_IMG_ENCODERS), \
+Index: offscreen/configure.in
+===================================================================
+--- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000
++++ offscreen/configure.in 2010-02-02 16:33:09.000000000 +0000
+@@ -3250,11 +3250,7 @@
+ dnl ========================================================
+ AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
+ $XLIBS $XEXT_LIBS)
+- AC_CHECK_HEADER(X11/extensions/XShm.h)
+- if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
+- test -n "$_HAVE_XSHM_XEXT"; then
+- AC_DEFINE(HAVE_XSHM)
+- fi
++ AC_DEFINE(HAVE_XSHM)
+
+ dnl ========================================================
+ dnl = Check for XIE
+@@ -8120,15 +8116,7 @@
+ fi # COMPILE_ENVIRONMENT
+
+ if test "$USE_FC_FREETYPE"; then
+- if test "$COMPILE_ENVIRONMENT"; then
+- _SAVE_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
+- AC_CHECK_HEADERS(fontconfig/fcfreetype.h, ,
+- [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
+- CPPFLAGS="$_SAVE_CPPFLAGS"
+- else
+ AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
+- fi
+ fi
+
+ 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 5ebe1a487..c61f8de8e 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 \
file://jsautocfg.h \
file://mozconfig"
PV = "0.2+hg-1.0+${SRCPV}"
-PR = "r9"
+PR = "r10"
S = "${WORKDIR}/offscreen"