Diff
Modified: releases/WebKitGTK/webkit-2.32/ChangeLog (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/ChangeLog 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/ChangeLog 2021-03-25 17:06:40 UTC (rev 275044)
@@ -1,3 +1,15 @@
+2021-03-18 Carlos Garcia Campos <[email protected]>
+
+ [WPE] Bump API version when building with libsoup3
+ https://bugs.webkit.org/show_bug.cgi?id=223437
+
+ Reviewed by Adrian Perez de Castro.
+
+ Use 1.1 as the API version when building with soup3.
+
+ * Source/PlatformWPE.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2021-03-16 Khem Raj <[email protected]>
[CMake] Build fails on RISC-V with GCC 11
Modified: releases/WebKitGTK/webkit-2.32/Source/PlatformWPE.cmake (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/PlatformWPE.cmake 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/PlatformWPE.cmake 2021-03-25 17:06:40 UTC (rev 275044)
@@ -5,8 +5,8 @@
WebKit
"${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml"
"${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-docs.sgml"
- "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_VERSION}-sections.txt"
- "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_VERSION}-sections.txt"
+ "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_DOC_VERSION}-sections.txt"
+ "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_DOC_VERSION}-sections.txt"
)
if (ENABLE_GTKDOC)
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-03-25 17:06:40 UTC (rev 275044)
@@ -1,3 +1,16 @@
+2021-03-18 Carlos Garcia Campos <[email protected]>
+
+ [WPE] Bump API version when building with libsoup3
+ https://bugs.webkit.org/show_bug.cgi?id=223437
+
+ Reviewed by Adrian Perez de Castro.
+
+ * PlatformWPE.cmake: Use WPE_API_DOC_VERSION instead of WPE_API_VERSION for gtkdoc config files.
+ * wpe/wpe-web-extension-uninstalled.pc.in: Add variable for libsoup version.
+ * wpe/wpe-web-extension.pc.in: Ditto.
+ * wpe/wpe-webkit-uninstalled.pc.in: Ditto.
+ * wpe/wpe-webkit.pc.in: Ditto.
+
2021-03-16 Carlos Garcia Campos <[email protected]>
[GTK][WPE] Stop using g_memdup
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformWPE.cmake (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformWPE.cmake 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformWPE.cmake 2021-03-25 17:06:40 UTC (rev 275044)
@@ -387,7 +387,7 @@
target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-wpe.cfg
- "[wpe-${WPE_API_VERSION}]\n"
+ "[wpe-${WPE_API_DOC_VERSION}]\n"
"pkgconfig_file=${WPE_PKGCONFIG_FILE}\n"
"decorator=WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\\(.+\\)\n"
"deprecation_guard=WEBKIT_DISABLE_DEPRECATED\n"
@@ -407,7 +407,7 @@
)
file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webextensions.cfg
- "[wpe-webextensions-${WPE_API_VERSION}]\n"
+ "[wpe-webextensions-${WPE_API_DOC_VERSION}]\n"
"pkgconfig_file=${WPEWebExtension_PKGCONFIG_FILE}\n"
"decorator=WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\\(.+\\)\n"
"deprecation_guard=WEBKIT_DISABLE_DEPRECATED\n"
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension-uninstalled.pc.in (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension-uninstalled.pc.in 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension-uninstalled.pc.in 2021-03-25 17:06:40 UTC (rev 275044)
@@ -7,6 +7,6 @@
Description: Embeddable Web content engine - Web process extensions
URL: https://wpewebkit.org
Version: @PROJECT_VERSION@
-Requires: glib-2.0 libsoup-2.4 wpe-1.0
+Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
Cflags: -I${includedir}/wpe-extension
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension.pc.in (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension.pc.in 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension.pc.in 2021-03-25 17:06:40 UTC (rev 275044)
@@ -7,6 +7,6 @@
Description: Embeddable Web content engine - Web process extensions
URL: https://wpewebkit.org
Version: @PROJECT_VERSION@
-Requires: glib-2.0 libsoup-2.4 wpe-1.0
+Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit-uninstalled.pc.in (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit-uninstalled.pc.in 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit-uninstalled.pc.in 2021-03-25 17:06:40 UTC (rev 275044)
@@ -7,6 +7,6 @@
Description: Embeddable Web content engine
URL: https://wpewebkit.org
Version: @PROJECT_VERSION@
-Requires: glib-2.0 libsoup-2.4 wpe-1.0
+Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
Cflags: -I${includedir}/ForwardingHeaders/wpe -I${includedir}/WebKit/ -I${includedir}/ForwardingHeaders/wpe-jsc -I${includedir}/_javascript_Core/_javascript_corewpe/
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit.pc.in (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit.pc.in 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit.pc.in 2021-03-25 17:06:40 UTC (rev 275044)
@@ -7,6 +7,6 @@
Description: Embeddable Web content engine
URL: https://wpewebkit.org
Version: @PROJECT_VERSION@
-Requires: glib-2.0 libsoup-2.4 wpe-1.0
+Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
Modified: releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsWPE.cmake (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsWPE.cmake 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsWPE.cmake 2021-03-25 17:06:40 UTC (rev 275044)
@@ -2,20 +2,8 @@
include(VersioningUtils)
SET_PROJECT_VERSION(2 31 91)
-set(WPE_API_VERSION 1.0)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 18 0 14)
-
-# These are shared variables, but we special case their definition so that we can use the
-# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
-set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
-set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
-
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
-if (USER_AGENT_BRANDING)
- add_definitions(-DUSER_AGENT_BRANDING=${USER_AGENT_BRANDING})
-endif ()
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
@@ -129,11 +117,30 @@
if (USE_SOUP2)
set(SOUP_MINIMUM_VERSION 2.54.0)
+ set(SOUP_API_VERSION 2.4)
+ set(WPE_API_VERSION 1.0)
+ set(WPE_API_DOC_VERSION 1.0)
else ()
set(SOUP_MINIMUM_VERSION 2.99.2)
+ set(SOUP_API_VERSION 3.0)
+ set(WPE_API_VERSION 1.1)
+ # No API changes in 1.1, so keep using the same API documentation.
+ set(WPE_API_DOC_VERSION 1.0)
endif ()
find_package(LibSoup ${SOUP_MINIMUM_VERSION} REQUIRED)
+if (WPE_API_VERSION VERSION_EQUAL "1.0")
+ CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 18 0 14)
+else ()
+ CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 0 0 0)
+endif ()
+
+# These are shared variables, but we special case their definition so that we can use the
+# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
+set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
+set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
+
if (ENABLE_ACCESSIBILITY)
find_package(ATK 2.16.0)
if (NOT ATK_FOUND)
@@ -216,6 +223,10 @@
add_definitions(-DGETTEXT_PACKAGE="WPE")
add_definitions(-DJSC_GLIB_API_ENABLED)
+if (USER_AGENT_BRANDING)
+ add_definitions(-DUSER_AGENT_BRANDING=${USER_AGENT_BRANDING})
+endif ()
+
if (EXISTS "${TOOLS_DIR}/glib/svn-revision")
execute_process(COMMAND ${TOOLS_DIR}/glib/svn-revision ERROR_QUIET OUTPUT_VARIABLE SVN_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE)
else ()
Modified: releases/WebKitGTK/webkit-2.32/Tools/ChangeLog (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Tools/ChangeLog 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Tools/ChangeLog 2021-03-25 17:06:40 UTC (rev 275044)
@@ -1,3 +1,14 @@
+2021-03-18 Carlos Garcia Campos <[email protected]>
+
+ [WPE] Bump API version when building with libsoup3
+ https://bugs.webkit.org/show_bug.cgi?id=223437
+
+ Reviewed by Adrian Perez de Castro.
+
+ Use WPE_API_DOC_VERSION instead of WPE_API_VERSION.
+
+ * wpe/manifest.txt.in:
+
2021-03-25 Carlos Garcia Campos <[email protected]>
[GTK][WPE] JSC crashes if a function expects a parameter but doesn't receive any
Modified: releases/WebKitGTK/webkit-2.32/Tools/wpe/manifest.txt.in (275043 => 275044)
--- releases/WebKitGTK/webkit-2.32/Tools/wpe/manifest.txt.in 2021-03-25 17:06:34 UTC (rev 275043)
+++ releases/WebKitGTK/webkit-2.32/Tools/wpe/manifest.txt.in 2021-03-25 17:06:40 UTC (rev 275044)
@@ -94,5 +94,5 @@
file Tools/CMakeLists.txt
file Tools/PlatformWPE.cmake
-directory ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_VERSION}/html/wpe-${WPE_API_VERSION} Documentation/wpe-${WPE_API_VERSION}/html
-directory ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_VERSION}/html/wpe-webextensions-${WPE_API_VERSION} Documentation/wpe-webextensions-${WPE_API_VERSION}/html
+directory ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_DOC_VERSION}/html/wpe-${WPE_API_DOC_VERSION} Documentation/wpe-${WPE_API_DOC_VERSION}/html
+directory ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html/wpe-webextensions-${WPE_API_DOC_VERSION} Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html
