webkit-gtk: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
Removed AM_PROG_CC_STDC. AC_PROG_CC to replace it was already
present.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..d9e8444
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkit-gtk-1.8.3/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Backport
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac
+--- webkit-1.8.3/configure.ac  2012-08-20 19:35:38.000000000 +0300
++++ webkit-1.8.3/configure.ac  2013-02-08 11:55:28.403397789 +0200
+@@ -111,7 +111,6 @@
+
+ AC_PROG_CC
+ AC_PROG_CXX
+-AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 66a30f877831eb2dcda62df281762761e0dcff5f..377b06ceacbd2244cb2657532396058c219cf3fa 100644 (file)
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
                     file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
 
-PR = "r0"
+PR = "r1"
 
 # Choice of language backends - icu has issues on Big Endian machines so use pango
 ICU_LIB = "icu"
@@ -23,6 +23,7 @@ SRC_URI = "\
   file://no-gtkdoc.patch \
   file://webgit-gtk_fix_build_with_automake_1.12.patch \
   file://bison-2.6.patch \
+  file://obsolete_automake_macros.patch \
  "
 
 SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"