Patchwork webkit-gtk: Fix build

login
register
mail settings
Submitter Gary Thomas
Date Jan. 6, 2012, 1:26 p.m.
Message ID <4F06F66D.8030703@mlbassoc.com>
Download mbox | patch
Permalink /patch/18653/
State New
Headers show

Comments

Gary Thomas - Jan. 6, 2012, 1:26 p.m.
This version (introduced in commit 663c893b084333ea9703079a9b056d74ffa5e2a3)
can only build if GL support is present.  This change enables that support
explicitly.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
  meta/recipes-sato/webkit/webkit-gtk_svn.bb |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)

1.7.7.5
Richard Purdie - Jan. 6, 2012, 3:15 p.m.
On Fri, 2012-01-06 at 06:26 -0700, Gary Thomas wrote:
> This version (introduced in commit 663c893b084333ea9703079a9b056d74ffa5e2a3)
> can only build if GL support is present.  This change enables that support
> explicitly.
> 
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> ---
>   meta/recipes-sato/webkit/webkit-gtk_svn.bb |    5 ++++-
>   1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
> index 9652953..6fcf3f1 100644
> --- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
> +++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
> @@ -7,7 +7,10 @@ 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=2f3cff0ad0a9c486da5a376928973a90"
>   -DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime 
> sqlite3"
> +DEPENDS = "virtual/libgl zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 \
> +           cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base \
> +           flex-native gperf-native perl-native-runtime sqlite3 \
> +"
>   DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
>    SRCREV_FORMAT = "source"


This patch is also corrupt and doesn't apply :(

Cheers,

Richard
Koen Kooi - Jan. 6, 2012, 3:40 p.m.
Op 6 jan. 2012, om 14:26 heeft Gary Thomas het volgende geschreven:

> This version (introduced in commit 663c893b084333ea9703079a9b056d74ffa5e2a3)
> can only build if GL support is present.  This change enables that support
> explicitly.

Isn't there a --disable-webgl option to keep feature parity with the old releases?

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 9652953..6fcf3f1 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -7,7 +7,10 @@  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=2f3cff0ad0a9c486da5a376928973a90"
  -DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime 
sqlite3"
+DEPENDS = "virtual/libgl zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 \
+           cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base \
+           flex-native gperf-native perl-native-runtime sqlite3 \
+"
  DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
   SRCREV_FORMAT = "source"
--