Changeset 272134 in webkit

Timestamp:

Feb 1, 2021, 2:20:09 AM (6 years ago)

Author:

Carlos Garcia Campos

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/JavaScriptCore:

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.

Location:

releases/WebKitGTK/webkit-2.30

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformGTK.cmake (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformGTK.cmake (modified) (3 diffs)
• Source/cmake/FindGObjectIntrospection.cmake (modified) (2 diffs)

releases/WebKitGTK/webkit-2.30/ChangeLog

@@ +1 @@
+2021-01-19  Lauro Moura  <lmoura@igalia.com>
+
+        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  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-01-19  Lauro Moura  <lmoura@igalia.com>
+
+        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  <mcatanzaro@gnome.org>
 

releases/WebKitGTK/webkit-2.30/Source/JavaScriptCore/PlatformGTK.cmake

@@ -69 +69 @@
     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}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
@@ -89 +93 @@
             --pkg-export=javascriptcoregtk-${WEBKITGTK_API_VERSION}
             --output=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
-            --sources-top-dirs=${CMAKE_BINARY_DIR}
+            ${GIR_SOURCES_TOP_DIRS}
             --c-include="jsc/jsc.h"
             -DJSC_COMPILATION

releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-19  Lauro Moura  <lmoura@igalia.com>
+
+        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  <mcatanzaro@gnome.org>
 

releases/WebKitGTK/webkit-2.30/Source/WebKit/PlatformGTK.cmake

@@ -647 +647 @@
         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
@@ -674 +678 @@
             --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
@@ -722 +726 @@
             --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

releases/WebKitGTK/webkit-2.30/Source/cmake/FindGObjectIntrospection.cmake

@@ -45 +45 @@
         _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}")
@@ -58 +62 @@
     INTROSPECTION_CFLAGS
     INTROSPECTION_LIBS
+    INTROSPECTION_VERSION
+    INTROSPECTION_HAVE_SOURCES_TOP_DIRS
 )