Title: [277008] releases/WebKitGTK/webkit-2.32/Source/WebKit
- Revision
- 277008
- Author
- [email protected]
- Date
- 2021-05-04 23:56:55 -0700 (Tue, 04 May 2021)
Log Message
Merge r276430 - [GTK] Build error: Couldn't find include 'Soup-2.4.gir'
https://bugs.webkit.org/show_bug.cgi?id=224926
Reviewed by Philippe Normand.
Use the right soup API version when generating the introspection.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (277007 => 277008)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-05-05 06:56:49 UTC (rev 277007)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-05-05 06:56:55 UTC (rev 277008)
@@ -1,3 +1,14 @@
+2021-04-22 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build error: Couldn't find include 'Soup-2.4.gir'
+ https://bugs.webkit.org/show_bug.cgi?id=224926
+
+ Reviewed by Philippe Normand.
+
+ Use the right soup API version when generating the introspection.
+
+ * PlatformGTK.cmake:
+
2021-05-04 Jim Mason <[email protected]>
[GTK] segmentation fault in WebKit::IconDatabase::loadIconForPageURL
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformGTK.cmake (277007 => 277008)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformGTK.cmake 2021-05-05 06:56:49 UTC (rev 277007)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformGTK.cmake 2021-05-05 06:56:55 UTC (rev 277008)
@@ -684,7 +684,7 @@
--nsversion=${WEBKITGTK_API_VERSION}
--include=GObject-2.0
--include=Gtk-${GTK_API_VERSION}.0
- --include=Soup-2.4
+ --include=Soup-${SOUP_API_VERSION}
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
--library=_javascript_coregtk-${WEBKITGTK_API_VERSION}
@@ -693,7 +693,7 @@
--no-libtool
--pkg=gobject-2.0
--pkg=${GTK_PKGCONFIG_PACKAGE}
- --pkg=libsoup-2.4
+ --pkg=libsoup-${SOUP_API_VERSION}
--pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
${GIR_SOURCES_TOP_DIRS}
@@ -731,7 +731,7 @@
--nsversion=${WEBKITGTK_API_VERSION}
--include=GObject-2.0
--include=Gtk-${GTK_API_VERSION}.0
- --include=Soup-2.4
+ --include=Soup-${SOUP_API_VERSION}
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
--library=_javascript_coregtk-${WEBKITGTK_API_VERSION}
@@ -741,7 +741,7 @@
--no-libtool
--pkg=gobject-2.0
--pkg=${GTK_PKGCONFIG_PACKAGE}
- --pkg=libsoup-2.4
+ --pkg=libsoup-${SOUP_API_VERSION}
--pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
${GIR_SOURCES_TOP_DIRS}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
