Title: [272133] releases/WebKitGTK/webkit-2.30/Source
- Revision
- 272133
- Author
- [email protected]
- Date
- 2021-02-01 02:20:04 -0800 (Mon, 01 Feb 2021)
Log Message
Merge r271580 - [GTK] Multilib conflicts in gir files
https://bugs.webkit.org/show_bug.cgi?id=220636
Patch by Michael Catanzaro <[email protected]> on 2021-01-18
Reviewed by Carlos Garcia Campos.
Source/_javascript_Core:
* PlatformGTK.cmake:
Source/WebKit:
By passing --sources-top-dirs to g-ir-scanner, we ensure all paths in the generated gir
files are relative to the toplevel builddir. This avoids multilib conflicts when the
builddir contains the target architecture.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/ChangeLog (272132 => 272133)
--- releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/ChangeLog 2021-02-01 10:20:00 UTC (rev 272132)
+++ releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/ChangeLog 2021-02-01 10:20:04 UTC (rev 272133)
@@ -1,3 +1,12 @@
+2021-01-18 Michael Catanzaro <[email protected]>
+
+ [GTK] Multilib conflicts in gir files
+ https://bugs.webkit.org/show_bug.cgi?id=220636
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake:
+
2020-08-19 Tadeu Zagallo <[email protected]>
B3 IntRange is incorrect for negative masks
Modified: releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/PlatformGTK.cmake (272132 => 272133)
--- releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/PlatformGTK.cmake 2021-02-01 10:20:00 UTC (rev 272132)
+++ releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/PlatformGTK.cmake 2021-02-01 10:20:04 UTC (rev 272133)
@@ -88,6 +88,7 @@
--pkg=gobject-2.0
--pkg-export=_javascript_coregtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
+ --sources-top-dirs=${CMAKE_BINARY_DIR}
--c-include="jsc/jsc.h"
-DJSC_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (272132 => 272133)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2021-02-01 10:20:00 UTC (rev 272132)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2021-02-01 10:20:04 UTC (rev 272133)
@@ -1,3 +1,16 @@
+2021-01-18 Michael Catanzaro <[email protected]>
+
+ [GTK] Multilib conflicts in gir files
+ https://bugs.webkit.org/show_bug.cgi?id=220636
+
+ Reviewed by Carlos Garcia Campos.
+
+ By passing --sources-top-dirs to g-ir-scanner, we ensure all paths in the generated gir
+ files are relative to the toplevel builddir. This avoids multilib conflicts when the
+ builddir contains the target architecture.
+
+ * PlatformGTK.cmake:
+
2020-12-27 Jim Mason <[email protected]>
[GTK] WebKitPluginProcess is built but not installed
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake (272132 => 272133)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake 2021-02-01 10:20:00 UTC (rev 272132)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake 2021-02-01 10:20:04 UTC (rev 272133)
@@ -673,6 +673,7 @@
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ --sources-top-dirs=${CMAKE_BINARY_DIR}
--c-include="webkit2/webkit2.h"
-DBUILDING_WEBKIT
-DWEBKIT2_COMPILATION
@@ -720,6 +721,7 @@
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+ --sources-top-dirs=${CMAKE_BINARY_DIR}
--c-include="webkit2/webkit-web-extension.h"
-DBUILDING_WEBKIT
-DWEBKIT2_COMPILATION
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
