Title: [283436] trunk
- Revision
- 283436
- Author
- [email protected]
- Date
- 2021-10-02 02:04:16 -0700 (Sat, 02 Oct 2021)
Log Message
[GTK][WPE] Enable bwrap launcher build on bots
https://bugs.webkit.org/show_bug.cgi?id=230969
Patch by Philippe Normand <[email protected]> on 2021-10-02
Reviewed by Michael Catanzaro.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (283435 => 283436)
--- trunk/ChangeLog 2021-10-02 06:51:34 UTC (rev 283435)
+++ trunk/ChangeLog 2021-10-02 09:04:16 UTC (rev 283436)
@@ -1,3 +1,13 @@
+2021-10-02 Philippe Normand <[email protected]>
+
+ [GTK][WPE] Enable bwrap launcher build on bots
+ https://bugs.webkit.org/show_bug.cgi?id=230969
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2021-09-30 Yusuke Suzuki <[email protected]>
Upgrade GCC requirement to 8.3.0
Modified: trunk/Source/cmake/OptionsGTK.cmake (283435 => 283436)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-10-02 06:51:34 UTC (rev 283435)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-10-02 09:04:16 UTC (rev 283436)
@@ -98,19 +98,15 @@
endif ()
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
endif ()
-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT EXISTS "/.flatpak-info")
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
-else ()
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC OFF)
-endif ()
-
# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
Modified: trunk/Source/cmake/OptionsWPE.cmake (283435 => 283436)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-10-02 06:51:34 UTC (rev 283435)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-10-02 09:04:16 UTC (rev 283436)
@@ -87,9 +87,11 @@
WEBKIT_OPTION_DEFINE(USE_EXTERNAL_HOLEPUNCH "Whether to enable external holepunch" PRIVATE OFF)
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
endif ()
@@ -100,12 +102,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_COG PRIVATE ON)
endif ()
-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT EXISTS "/.flatpak-info")
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
-else ()
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC OFF)
-endif ()
-
# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
