Diff
Modified: trunk/Tools/ChangeLog (268854 => 268855)
--- trunk/Tools/ChangeLog 2020-10-22 05:24:58 UTC (rev 268854)
+++ trunk/Tools/ChangeLog 2020-10-22 06:43:54 UTC (rev 268855)
@@ -1,3 +1,21 @@
+2020-10-21 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [JHbuild] Add patch to wpebackend-fdo to fix the build on Ubuntu-18.04
+ https://bugs.webkit.org/show_bug.cgi?id=218068
+
+ Reviewed by Adrian Perez de Castro.
+
+ On r268591 I updated the version of wpebackend-fdo to the last stable 1.8
+ but this version is failing to build on Ubuntu-18.04 because of the cmake version.
+ Backport a patch to fix this.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/wpebackend-fdo-cmake-buildfix-3.10.patch: Added.
+ * jhbuild/jhbuild-minimal.modules:
+ * jhbuild/patches/wpebackend-fdo-cmake-buildfix-3.10.patch: Added.
+ * wpe/jhbuild.modules:
+ * wpe/patches/wpebackend-fdo-cmake-buildfix-3.10.patch: Added.
+
2020-10-21 Ryosuke Niwa <rn...@webkit.org>
IPC testing API should have the capability to observe messages being sent and received
Modified: trunk/Tools/gtk/jhbuild.modules (268854 => 268855)
--- trunk/Tools/gtk/jhbuild.modules 2020-10-22 05:24:58 UTC (rev 268854)
+++ trunk/Tools/gtk/jhbuild.modules 2020-10-22 06:43:54 UTC (rev 268855)
@@ -483,7 +483,9 @@
</dependencies>
<branch module="wpebackend-fdo-1.8.0.tar.xz" version="1.8.0"
repo="wpewebkit"
- hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253"/>
+ hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253">
+ <patch file="wpebackend-fdo-cmake-buildfix-3.10.patch" strip="1"/>
+ </branch>
</cmake>
<!-- Dependencies listed below this point are not thought to affect test results, and are only
Added: trunk/Tools/gtk/patches/wpebackend-fdo-cmake-buildfix-3.10.patch (0 => 268855)
--- trunk/Tools/gtk/patches/wpebackend-fdo-cmake-buildfix-3.10.patch (rev 0)
+++ trunk/Tools/gtk/patches/wpebackend-fdo-cmake-buildfix-3.10.patch 2020-10-22 06:43:54 UTC (rev 268855)
@@ -0,0 +1,35 @@
+From 1d1a01452fb5df6c7cba1aff5a21636ab6cf838b Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <clo...@igalia.com>
+Date: Mon, 19 Oct 2020 21:09:57 +0200
+Subject: [PATCH] cmake: use add_definitions instead of add_compile_definitions
+
+* add_compile_definitions() requires CMake 3.12, but Ubuntu-18.04
+ships CMake 3.10. This fixes the build for old CMake versions.
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 16741f0..6920aaf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,11 +45,11 @@ find_package(Wayland REQUIRED client server egl)
+ find_package(WaylandScanner REQUIRED)
+ find_package(WPE 1.5.90 REQUIRED)
+
+-add_compile_definitions(
+- WPE_FDO_COMPILATION
+- G_LOG_DOMAIN=\"WPE-FDO\"
+- _FILE_OFFSET_BITS=64
+- _LARGEFILE64_SOURCE=1
++add_definitions(
++ -DWPE_FDO_COMPILATION
++ -DG_LOG_DOMAIN=\"WPE-FDO\"
++ -D_FILE_OFFSET_BITS=64
++ -D_LARGEFILE64_SOURCE=1
+ )
+
+ configure_file(include/wpe/version.h.cmake "${CMAKE_BINARY_DIR}/version.h" @ONLY)
+--
+2.20.1
+
Modified: trunk/Tools/jhbuild/jhbuild-minimal.modules (268854 => 268855)
--- trunk/Tools/jhbuild/jhbuild-minimal.modules 2020-10-22 05:24:58 UTC (rev 268854)
+++ trunk/Tools/jhbuild/jhbuild-minimal.modules 2020-10-22 06:43:54 UTC (rev 268855)
@@ -75,7 +75,9 @@
</dependencies>
<branch module="wpebackend-fdo-1.8.0.tar.xz" version="1.8.0"
repo="wpewebkit"
- hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253"/>
+ hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253">
+ <patch file="wpebackend-fdo-cmake-buildfix-3.10.patch" strip="1"/>
+ </branch>
</cmake>
<!-- libsoup >= 2.69 required for SameSite cookie support -->
Added: trunk/Tools/jhbuild/patches/wpebackend-fdo-cmake-buildfix-3.10.patch (0 => 268855)
--- trunk/Tools/jhbuild/patches/wpebackend-fdo-cmake-buildfix-3.10.patch (rev 0)
+++ trunk/Tools/jhbuild/patches/wpebackend-fdo-cmake-buildfix-3.10.patch 2020-10-22 06:43:54 UTC (rev 268855)
@@ -0,0 +1,35 @@
+From 1d1a01452fb5df6c7cba1aff5a21636ab6cf838b Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <clo...@igalia.com>
+Date: Mon, 19 Oct 2020 21:09:57 +0200
+Subject: [PATCH] cmake: use add_definitions instead of add_compile_definitions
+
+* add_compile_definitions() requires CMake 3.12, but Ubuntu-18.04
+ships CMake 3.10. This fixes the build for old CMake versions.
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 16741f0..6920aaf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,11 +45,11 @@ find_package(Wayland REQUIRED client server egl)
+ find_package(WaylandScanner REQUIRED)
+ find_package(WPE 1.5.90 REQUIRED)
+
+-add_compile_definitions(
+- WPE_FDO_COMPILATION
+- G_LOG_DOMAIN=\"WPE-FDO\"
+- _FILE_OFFSET_BITS=64
+- _LARGEFILE64_SOURCE=1
++add_definitions(
++ -DWPE_FDO_COMPILATION
++ -DG_LOG_DOMAIN=\"WPE-FDO\"
++ -D_FILE_OFFSET_BITS=64
++ -D_LARGEFILE64_SOURCE=1
+ )
+
+ configure_file(include/wpe/version.h.cmake "${CMAKE_BINARY_DIR}/version.h" @ONLY)
+--
+2.20.1
+
Modified: trunk/Tools/wpe/jhbuild.modules (268854 => 268855)
--- trunk/Tools/wpe/jhbuild.modules 2020-10-22 05:24:58 UTC (rev 268854)
+++ trunk/Tools/wpe/jhbuild.modules 2020-10-22 06:43:54 UTC (rev 268855)
@@ -198,7 +198,9 @@
</dependencies>
<branch module="wpebackend-fdo-1.8.0.tar.xz" version="1.8.0"
repo="wpewebkit"
- hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253"/>
+ hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253">
+ <patch file="wpebackend-fdo-cmake-buildfix-3.10.patch" strip="1"/>
+ </branch>
</cmake>
<autotools id="libgpg-error" autogen-sh="autoreconf">
Added: trunk/Tools/wpe/patches/wpebackend-fdo-cmake-buildfix-3.10.patch (0 => 268855)
--- trunk/Tools/wpe/patches/wpebackend-fdo-cmake-buildfix-3.10.patch (rev 0)
+++ trunk/Tools/wpe/patches/wpebackend-fdo-cmake-buildfix-3.10.patch 2020-10-22 06:43:54 UTC (rev 268855)
@@ -0,0 +1,35 @@
+From 1d1a01452fb5df6c7cba1aff5a21636ab6cf838b Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <clo...@igalia.com>
+Date: Mon, 19 Oct 2020 21:09:57 +0200
+Subject: [PATCH] cmake: use add_definitions instead of add_compile_definitions
+
+* add_compile_definitions() requires CMake 3.12, but Ubuntu-18.04
+ships CMake 3.10. This fixes the build for old CMake versions.
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 16741f0..6920aaf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,11 +45,11 @@ find_package(Wayland REQUIRED client server egl)
+ find_package(WaylandScanner REQUIRED)
+ find_package(WPE 1.5.90 REQUIRED)
+
+-add_compile_definitions(
+- WPE_FDO_COMPILATION
+- G_LOG_DOMAIN=\"WPE-FDO\"
+- _FILE_OFFSET_BITS=64
+- _LARGEFILE64_SOURCE=1
++add_definitions(
++ -DWPE_FDO_COMPILATION
++ -DG_LOG_DOMAIN=\"WPE-FDO\"
++ -D_FILE_OFFSET_BITS=64
++ -D_LARGEFILE64_SOURCE=1
+ )
+
+ configure_file(include/wpe/version.h.cmake "${CMAKE_BINARY_DIR}/version.h" @ONLY)
+--
+2.20.1
+
