Title: [272134] releases/WebKitGTK/webkit-2.30
- Revision
- 272134
- Author
- [email protected]
- Date
- 2021-02-01 02:20:09 -0800 (Mon, 01 Feb 2021)
Log Message
Merge r271608 - REGRESSION(r271580) [GTK] LTS/Debian build failure due to unsupported g-ir-scanner parameter
https://bugs.webkit.org/show_bug.cgi?id=220730
Reviewed by Philippe Normand.
.:
* Source/cmake/FindGObjectIntrospection.cmake: Expose variable about the
presence of --sources-top-dirs.
Source/_javascript_Core:
No new behavior. No new tests.
* PlatformGTK.cmake: Expose --sources-top-dirs only if available.
Source/WebKit:
No new behavior. No new tests.
* PlatformGTK.cmake: Expose --sources-top-dirs only if available.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.30/ChangeLog (272133 => 272134)
--- releases/WebKitGTK/webkit-2.30/ChangeLog 2021-02-01 10:20:04 UTC (rev 272133)
+++ releases/WebKitGTK/webkit-2.30/ChangeLog 2021-02-01 10:20:09 UTC (rev 272134)
@@ -1,3 +1,13 @@
+2021-01-19 Lauro Moura <[email protected]>
+
+ REGRESSION(r271580) [GTK] LTS/Debian build failure due to unsupported g-ir-scanner parameter
+ https://bugs.webkit.org/show_bug.cgi?id=220730
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/FindGObjectIntrospection.cmake: Expose variable about the
+ presence of --sources-top-dirs.
+
2020-12-15 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.30.4 release
Modified: releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/ChangeLog (272133 => 272134)
--- releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/ChangeLog 2021-02-01 10:20:04 UTC (rev 272133)
+++ releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/ChangeLog 2021-02-01 10:20:09 UTC (rev 272134)
@@ -1,3 +1,14 @@
+2021-01-19 Lauro Moura <[email protected]>
+
+ REGRESSION(r271580) [GTK] LTS/Debian build failure due to unsupported g-ir-scanner parameter
+ https://bugs.webkit.org/show_bug.cgi?id=220730
+
+ Reviewed by Philippe Normand.
+
+ No new behavior. No new tests.
+
+ * PlatformGTK.cmake: Expose --sources-top-dirs only if available.
+
2021-01-18 Michael Catanzaro <[email protected]>
[GTK] Multilib conflicts in gir files
Modified: releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/PlatformGTK.cmake (272133 => 272134)
--- releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/PlatformGTK.cmake 2021-02-01 10:20:04 UTC (rev 272133)
+++ releases/WebKitGTK/webkit-2.30/Source/_javascript_Core/PlatformGTK.cmake 2021-02-01 10:20:09 UTC (rev 272134)
@@ -68,6 +68,10 @@
# Add required -L flags from ${CMAKE_SHARED_LINKER_FLAGS} for g-ir-scanner
string(REGEX MATCHALL "-L[^ ]*" INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ if (${INTROSPECTION_HAVE_SOURCES_TOP_DIRS})
+ set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
+ endif ()
+
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
DEPENDS _javascript_Core
@@ -88,7 +92,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}
+ ${GIR_SOURCES_TOP_DIRS}
--c-include="jsc/jsc.h"
-DJSC_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (272133 => 272134)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2021-02-01 10:20:04 UTC (rev 272133)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog 2021-02-01 10:20:09 UTC (rev 272134)
@@ -1,3 +1,14 @@
+2021-01-19 Lauro Moura <[email protected]>
+
+ REGRESSION(r271580) [GTK] LTS/Debian build failure due to unsupported g-ir-scanner parameter
+ https://bugs.webkit.org/show_bug.cgi?id=220730
+
+ Reviewed by Philippe Normand.
+
+ No new behavior. No new tests.
+
+ * PlatformGTK.cmake: Expose --sources-top-dirs only if available.
+
2021-01-18 Michael Catanzaro <[email protected]>
[GTK] Multilib conflicts in gir files
Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake (272133 => 272134)
--- releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake 2021-02-01 10:20:04 UTC (rev 272133)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake 2021-02-01 10:20:09 UTC (rev 272134)
@@ -646,6 +646,10 @@
string(REGEX MATCHALL "-L[^ ]*"
INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ if (${INTROSPECTION_HAVE_SOURCES_TOP_DIRS})
+ set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
+ endif ()
+
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
DEPENDS WebKit
@@ -673,7 +677,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}
+ ${GIR_SOURCES_TOP_DIRS}
--c-include="webkit2/webkit2.h"
-DBUILDING_WEBKIT
-DWEBKIT2_COMPILATION
@@ -721,7 +725,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}
+ ${GIR_SOURCES_TOP_DIRS}
--c-include="webkit2/webkit-web-extension.h"
-DBUILDING_WEBKIT
-DWEBKIT2_COMPILATION
Modified: releases/WebKitGTK/webkit-2.30/Source/cmake/FindGObjectIntrospection.cmake (272133 => 272134)
--- releases/WebKitGTK/webkit-2.30/Source/cmake/FindGObjectIntrospection.cmake 2021-02-01 10:20:04 UTC (rev 272133)
+++ releases/WebKitGTK/webkit-2.30/Source/cmake/FindGObjectIntrospection.cmake 2021-02-01 10:20:09 UTC (rev 272134)
@@ -44,6 +44,10 @@
_gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate" "")
_gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir" "")
_gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir" "")
+ set(INTROSPECTION_VERSION "${_pc_gir_VERSION}")
+ if (${INTROSPECTION_VERSION} VERSION_GREATER_EQUAL "1.59.1")
+ set(INTROSPECTION_HAVE_SOURCES_TOP_DIRS YES)
+ endif ()
set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
endif ()
@@ -57,4 +61,6 @@
INTROSPECTION_TYPELIBDIR
INTROSPECTION_CFLAGS
INTROSPECTION_LIBS
+ INTROSPECTION_VERSION
+ INTROSPECTION_HAVE_SOURCES_TOP_DIRS
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
