Title: [270178] trunk
- Revision
- 270178
- Author
- [email protected]
- Date
- 2020-11-26 20:21:54 -0800 (Thu, 26 Nov 2020)
Log Message
[GTK][GTK4] Building with GObject-Introspection support does not work
https://bugs.webkit.org/show_bug.cgi?id=219221
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/OptionsGTK.cmake: Allow introspection with GTK4.
Source/WebKit:
* PlatformGTK.cmake: Forward GTK version to gir scanner and use correct pkg-config package.
Modified Paths
Diff
Modified: trunk/ChangeLog (270177 => 270178)
--- trunk/ChangeLog 2020-11-27 02:55:41 UTC (rev 270177)
+++ trunk/ChangeLog 2020-11-27 04:21:54 UTC (rev 270178)
@@ -1,3 +1,12 @@
+2020-11-26 Lauro Moura <[email protected]>
+
+ [GTK][GTK4] Building with GObject-Introspection support does not work
+ https://bugs.webkit.org/show_bug.cgi?id=219221
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake: Allow introspection with GTK4.
+
2020-11-26 Fujii Hironori <[email protected]>
[WinCairo] Enable GPU process
Modified: trunk/Source/WebKit/ChangeLog (270177 => 270178)
--- trunk/Source/WebKit/ChangeLog 2020-11-27 02:55:41 UTC (rev 270177)
+++ trunk/Source/WebKit/ChangeLog 2020-11-27 04:21:54 UTC (rev 270178)
@@ -1,5 +1,14 @@
2020-11-26 Lauro Moura <[email protected]>
+ [GTK][GTK4] Building with GObject-Introspection support does not work
+ https://bugs.webkit.org/show_bug.cgi?id=219221
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake: Forward GTK version to gir scanner and use correct pkg-config package.
+
+2020-11-26 Lauro Moura <[email protected]>
+
[GTK4] Declare lambda return type to avoid build error deducing it
https://bugs.webkit.org/show_bug.cgi?id=219268
Modified: trunk/Source/WebKit/PlatformGTK.cmake (270177 => 270178)
--- trunk/Source/WebKit/PlatformGTK.cmake 2020-11-27 02:55:41 UTC (rev 270177)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2020-11-27 04:21:54 UTC (rev 270178)
@@ -66,8 +66,10 @@
if (USE_GTK4)
set(GTK_API_VERSION 4)
+ set(GTK_PKGCONFIG_PACKAGE gtk4)
else ()
set(GTK_API_VERSION 3)
+ set(GTK_PKGCONFIG_PACKAGE gtk+-3.0)
endif ()
set(WebKit2GTK_INSTALLED_HEADERS
@@ -650,7 +652,7 @@
--namespace=WebKit2
--nsversion=${WEBKITGTK_API_VERSION}
--include=GObject-2.0
- --include=Gtk-3.0
+ --include=Gtk-${GTK_API_VERSION}.0
--include=Soup-2.4
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
@@ -659,7 +661,7 @@
${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}
--no-libtool
--pkg=gobject-2.0
- --pkg=gtk+-3.0
+ --pkg=${GTK_PKGCONFIG_PACKAGE}
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -696,7 +698,7 @@
--namespace=WebKit2WebExtension
--nsversion=${WEBKITGTK_API_VERSION}
--include=GObject-2.0
- --include=Gtk-3.0
+ --include=Gtk-${GTK_API_VERSION}.0
--include=Soup-2.4
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
@@ -706,7 +708,7 @@
${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}
--no-libtool
--pkg=gobject-2.0
- --pkg=gtk+-3.0
+ --pkg=${GTK_PKGCONFIG_PACKAGE}
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
Modified: trunk/Source/cmake/OptionsGTK.cmake (270177 => 270178)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-11-27 02:55:41 UTC (rev 270177)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-11-27 04:21:54 UTC (rev 270178)
@@ -246,10 +246,6 @@
endif ()
endif ()
-if (USE_GTK4)
- set(ENABLE_INTROSPECTION OFF)
-endif ()
-
if (ENABLE_INTROSPECTION)
find_package(GObjectIntrospection)
if (NOT INTROSPECTION_FOUND)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
