Patchwork webkit: fix compilation without X11

login
register
mail settings
Submitter Stephan Hoffmann
Date Dec. 28, 2012, 8:04 a.m.
Message ID <1356681885-4123-1-git-send-email-sho@relinux.de>
Download mbox | patch
Permalink /patch/208419/
State Accepted
Commit 9fce375dfc7d2040d10925e78286708576334f93
Headers show

Comments

Stephan Hoffmann - Dec. 28, 2012, 8:04 a.m.
Fixes:
 http://autobuild.buildroot.net/results/86534588d192fe1515ce520c109e884864871d94/
and others.

Webkit includes X11 headers even when configuerd for DirecfFB, because
the test within GNUmakefile.in does not work properly. Autoreconfigure
fails because of incompatibility with buildroot's autotools version.

For now a patch for GNUmakefile.in fixes this problem.

Since webkit release is quite old it doesn't seem to be worth doing more,
on the long run we should bump the version.

Signed-off-by: Stephan Hoffmann <sho@relinux.de>
---
 .../webkit-fix-compilation-on-DirectFB-2.patch     |   33 ++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
Stephan Hoffmann - Jan. 11, 2013, 7:45 a.m.
Ping;-)

Am 28.12.2012 09:04, schrieb Stephan Hoffmann:
> Fixes:
>  http://autobuild.buildroot.net/results/86534588d192fe1515ce520c109e884864871d94/
> and others.
>
> Webkit includes X11 headers even when configuerd for DirecfFB, because
> the test within GNUmakefile.in does not work properly. Autoreconfigure
> fails because of incompatibility with buildroot's autotools version.
>
> For now a patch for GNUmakefile.in fixes this problem.
>
> Since webkit release is quite old it doesn't seem to be worth doing more,
> on the long run we should bump the version.
>
> Signed-off-by: Stephan Hoffmann <sho@relinux.de>
> ---
>  .../webkit-fix-compilation-on-DirectFB-2.patch     |   33 ++++++++++++++++++++
>  1 files changed, 33 insertions(+), 0 deletions(-)
>  create mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
>
> diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
> new file mode 100644
> index 0000000..097fa5d
> --- /dev/null
> +++ b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
> @@ -0,0 +1,33 @@
> +From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001
> +From: Stephan Hoffmann <sho@relinux.de>
> +Date: Thu, 27 Dec 2012 18:08:29 +0100
> +Subject: [PATCH] Fix test for presence of X11
> +
> +The test in GNUmakefile.in checking for presence of X11 and
> +enabling the XP_UNIX define succeeds even when X11 is not
> +present and Webkit is built for DirectFB.
> +
> +Because of this X11-headers are included and the build fails.
> +
> +Signed-off-by: Stephan Hoffmann <sho@relinux.de>
> +---
> + GNUmakefile.in |    3 ++-
> + 1 files changed, 2 insertions(+), 1 deletions(-)
> +
> +diff --git a/GNUmakefile.in b/GNUmakefile.in
> +index f14f27b..3ac811f 100644
> +--- a/GNUmakefile.in
> ++++ b/GNUmakefile.in
> +@@ -88,7 +88,8 @@ noinst_PROGRAMS = Programs/minidom$(EXEEXT) \
> + 	$(am__EXEEXT_1)
> + 
> + # For the Gtk port we want to use XP_UNIX both in X11 and Mac
> +-@TARGET_WIN32_FALSE@am__append_1 = -DXP_UNIX
> ++@TARGET_X11_TRUE@am__append_1 = -DXP_UNIX
> ++@TARGET_QUARTZ_TRUE@am__append_1 = -DXP_UNIX
> + @USE_ICU_UNICODE_TRUE@am__append_2 = \
> + @USE_ICU_UNICODE_TRUE@	-DWTF_USE_ICU_UNICODE=1
> + 
> +-- 
> +1.7.0.4
> +
Peter Korsgaard - Jan. 14, 2013, 10:51 p.m.
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:

 Stephan> Fixes:
 Stephan>  http://autobuild.buildroot.net/results/86534588d192fe1515ce520c109e884864871d94/
 Stephan> and others.

 Stephan> Webkit includes X11 headers even when configuerd for DirecfFB, because
 Stephan> the test within GNUmakefile.in does not work properly. Autoreconfigure
 Stephan> fails because of incompatibility with buildroot's autotools version.

 Stephan> For now a patch for GNUmakefile.in fixes this problem.

 Stephan> Since webkit release is quite old it doesn't seem to be worth
 Stephan> doing more, on the long run we should bump the version.

Indeed. Committed, thanks.

Patch

diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
new file mode 100644
index 0000000..097fa5d
--- /dev/null
+++ b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch
@@ -0,0 +1,33 @@ 
+From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001
+From: Stephan Hoffmann <sho@relinux.de>
+Date: Thu, 27 Dec 2012 18:08:29 +0100
+Subject: [PATCH] Fix test for presence of X11
+
+The test in GNUmakefile.in checking for presence of X11 and
+enabling the XP_UNIX define succeeds even when X11 is not
+present and Webkit is built for DirectFB.
+
+Because of this X11-headers are included and the build fails.
+
+Signed-off-by: Stephan Hoffmann <sho@relinux.de>
+---
+ GNUmakefile.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index f14f27b..3ac811f 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -88,7 +88,8 @@ noinst_PROGRAMS = Programs/minidom$(EXEEXT) \
+ 	$(am__EXEEXT_1)
+ 
+ # For the Gtk port we want to use XP_UNIX both in X11 and Mac
+-@TARGET_WIN32_FALSE@am__append_1 = -DXP_UNIX
++@TARGET_X11_TRUE@am__append_1 = -DXP_UNIX
++@TARGET_QUARTZ_TRUE@am__append_1 = -DXP_UNIX
+ @USE_ICU_UNICODE_TRUE@am__append_2 = \
+ @USE_ICU_UNICODE_TRUE@	-DWTF_USE_ICU_UNICODE=1
+ 
+-- 
+1.7.0.4
+