Diff
Modified: trunk/LayoutTests/ChangeLog (282877 => 282878)
--- trunk/LayoutTests/ChangeLog 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/ChangeLog 2021-09-22 16:37:27 UTC (rev 282878)
@@ -1,3 +1,32 @@
+2021-09-22 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] Switch runtime to 21.08 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=229919
+
+ Reviewed by Michael Catanzaro.
+
+ Tests expectations update for the new SDK runtime.
+
+ * platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt:
+ * platform/glib/svg/custom/use-invalid-pattern-expected.txt: Added.
+ * platform/glib/svg/custom/use-invalid-style-expected.txt: Added.
+ * platform/gtk/fast/invalid/missing-end-tag-expected.txt:
+ * platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-expected.txt: Added.
+ * platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-redirect-expected.txt:
+ * platform/gtk/svg/hixie/error/012-expected.png: Removed.
+ * platform/gtk/svg/hixie/error/012-expected.txt:
+ * platform/wpe/fast/invalid/missing-end-tag-expected.txt:
+ * platform/wpe/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt:
+ * platform/wpe/fast/table/table-split-on-insert-with-section-crash-expected.txt: Added.
+ * platform/wpe/fast/text/international/spaces-combined-in-vertical-text-expected.txt:
+ * platform/wpe/fast/text/justify-nbsp-expected.txt: Added.
+ * platform/wpe/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
+ * platform/wpe/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.txt:
+ * platform/wpe/svg/hixie/error/012-expected.txt:
+ * platform/wpe/svg/text/text-altglyph-01-b-expected.txt:
+ * platform/wpe/svg/text/text-text-04-t-expected.txt:
+ * platform/wpe/svg/text/text-text-06-t-expected.txt:
+
2021-09-22 Alan Bujtas <za...@apple.com>
[WIN] Unreviewed test gardening
Modified: trunk/LayoutTests/platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -1,12 +1,12 @@
CONSOLE MESSAGE: Opening and ending tag mismatch: p line 8 and body
-CONSOLE MESSAGE: Opening and ending tag mismatch: body line 8 and html
+CONSOLE MESSAGE: Opening and ending tag mismatch: body line 6 and html
-CONSOLE MESSAGE: Opening and ending tag mismatch: html line 8 and xsl:template
+CONSOLE MESSAGE: Opening and ending tag mismatch: html line 5 and xsl:template
-CONSOLE MESSAGE: Opening and ending tag mismatch: template line 8 and stylesheet
+CONSOLE MESSAGE: Opening and ending tag mismatch: template line 4 and stylesheet
-CONSOLE MESSAGE: EndTag: '</' not found
+CONSOLE MESSAGE: Premature end of data in tag stylesheet line 2
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
Added: trunk/LayoutTests/platform/glib/svg/custom/use-invalid-pattern-expected.txt (0 => 282878)
--- trunk/LayoutTests/platform/glib/svg/custom/use-invalid-pattern-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/glib/svg/custom/use-invalid-pattern-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -0,0 +1,7 @@
+This page contains the following errors:
+
+error on line 11 at column 7: Opening and ending tag mismatch: use line 10 and svg
+Below is a rendering of the page up to the first error.
+
+This should not crash, but display an error document.
+
Added: trunk/LayoutTests/platform/glib/svg/custom/use-invalid-style-expected.txt (0 => 282878)
--- trunk/LayoutTests/platform/glib/svg/custom/use-invalid-style-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/glib/svg/custom/use-invalid-style-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -0,0 +1,7 @@
+This page contains the following errors:
+
+error on line 10 at column 7: Opening and ending tag mismatch: junk line 9 and svg
+Below is a rendering of the page up to the first error.
+
+This should not crash, but display an error document.
+
Modified: trunk/LayoutTests/platform/gtk/fast/invalid/missing-end-tag-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/gtk/fast/invalid/missing-end-tag-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/gtk/fast/invalid/missing-end-tag-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -8,7 +8,7 @@
text run at (0,0) width 324: "This page contains the following errors:"
RenderBlock {div} at (18,61) size 732x15
RenderText {#text} at (0,0) size 553x14
- text run at (0,0) width 553: "error on line 7 at column 8: Opening and ending tag mismatch: p line 0 and body"
+ text run at (0,0) width 553: "error on line 7 at column 8: Opening and ending tag mismatch: p line 6 and body"
text run at (552,0) width 1: " "
RenderBlock {h3} at (18,94) size 732x23
RenderText {#text} at (0,0) size 427x21
Added: trunk/LayoutTests/platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-expected.txt (0 => 282878)
--- trunk/LayoutTests/platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -0,0 +1,4 @@
+CONSOLE MESSAGE: Unsafe attempt to load URL http://localhost:8000/security/resources/target.xml from origin http://127.0.0.1:8000. Domains, protocols and ports must match.
+
+This test includes a cross-origin external entity. It passes if the load fails and thus there is no text below this line.
+
Modified: trunk/LayoutTests/platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-redirect-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-redirect-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/gtk/http/tests/security/xss-DENIED-xsl-external-entity-redirect-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -1,6 +1,5 @@
CONSOLE MESSAGE: Document is empty
CONSOLE MESSAGE: Did not parse external entity resource at 'http://127.0.0.1:8000/resources/redirect.py?url="" because cross-origin loads are not allowed.
-CONSOLE MESSAGE: Did not parse external entity resource at 'http://127.0.0.1:8000/resources/redirect.py?url="" because cross-origin loads are not allowed.
This test includes a cross-origin external entity. It passes if the load fails and thus there is no text below this line.
Deleted: trunk/LayoutTests/platform/gtk/svg/hixie/error/012-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/gtk/svg/hixie/error/012-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/gtk/svg/hixie/error/012-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/gtk/svg/hixie/error/012-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -9,7 +9,7 @@
text run at (0,0) width 324: "This page contains the following errors:"
RenderBlock {div} at (18,61) size 701x15
RenderText {#text} at (0,0) size 567x14
- text run at (0,0) width 567: "error on line 5 at column 7: Opening and ending tag mismatch: rect line 0 and svg"
+ text run at (0,0) width 567: "error on line 5 at column 7: Opening and ending tag mismatch: rect line 4 and svg"
text run at (566,0) width 1: " "
RenderBlock {h3} at (18,94) size 701x23
RenderText {#text} at (0,0) size 427x21
Modified: trunk/LayoutTests/platform/wpe/fast/invalid/missing-end-tag-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/fast/invalid/missing-end-tag-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/fast/invalid/missing-end-tag-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -8,7 +8,7 @@
text run at (0,0) width 324: "This page contains the following errors:"
RenderBlock {div} at (18,61) size 732x15
RenderText {#text} at (0,0) size 553x14
- text run at (0,0) width 553: "error on line 7 at column 8: Opening and ending tag mismatch: p line 0 and body"
+ text run at (0,0) width 553: "error on line 7 at column 8: Opening and ending tag mismatch: p line 6 and body"
text run at (553,0) width 0: " "
RenderBlock {h3} at (18,94) size 732x23
RenderText {#text} at (0,0) size 429x21
Modified: trunk/LayoutTests/platform/wpe/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/fast/multicol/pagination/LeftToRight-tb-hittest-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -126,7 +126,7 @@
text run at (0,291) width 362: "occaecat cupidatat non proident, sunt"
text run at (0,318) width 338: "in culpa qui officia deserunt mollit"
text run at (0,345) width 200: "anim id est laborum."
-layer at (1250,81) size 56x56
- RenderBlock (positioned) {DIV} at (1250,81) size 56x56 [border: (3px solid #0000FF)]
+layer at (1250,80) size 56x56
+ RenderBlock (positioned) {DIV} at (1250,80) size 56x56 [border: (3px solid #0000FF)]
caret: position 353 of child 0 {#text} of child 11 {P} of body
scrolled to 800,0
Added: trunk/LayoutTests/platform/wpe/fast/table/table-split-on-insert-with-section-crash-expected.txt (0 => 282878)
--- trunk/LayoutTests/platform/wpe/fast/table/table-split-on-insert-with-section-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wpe/fast/table/table-split-on-insert-with-section-crash-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -0,0 +1 @@
+
Modified: trunk/LayoutTests/platform/wpe/fast/text/international/spaces-combined-in-vertical-text-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/fast/text/international/spaces-combined-in-vertical-text-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/fast/text/international/spaces-combined-in-vertical-text-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -1 +1 @@
-
+PASS if no ASSERT fail or crash in debug build.
Added: trunk/LayoutTests/platform/wpe/fast/text/justify-nbsp-expected.txt (0 => 282878)
--- trunk/LayoutTests/platform/wpe/fast/text/justify-nbsp-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wpe/fast/text/justify-nbsp-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 656x206 [border: (3px solid #0000FF)]
+ RenderInline {SPAN} at (0,0) size 358x25
+ RenderText {#text} at (3,15) size 358x25
+ text run at (3,15) width 358: "a b c d "
+ RenderText {#text} at (360,15) size 650x75
+ text run at (360,15) width 293: "e f g h"
+ text run at (3,65) width 275: "xxxxxxxxxxx"
+ RenderBR {BR} at (278,65) size 0x25
+ RenderInline {SPAN} at (0,0) size 358x25
+ RenderText {#text} at (3,115) size 358x25
+ text run at (3,115) width 358: "a b c d "
+ RenderText {#text} at (360,115) size 650x75
+ text run at (360,115) width 293: "e f g h"
+ text run at (3,165) width 275: "xxxxxxxxxxx"
Modified: trunk/LayoutTests/platform/wpe/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -56,6 +56,6 @@
RenderSVGRect {rect} at (0,0) size 800x600 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
RenderSVGContainer {g} at (0,0) size 800x38
RenderSVGRect {rect} at (0,0) size 800x36 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (207,2) size 66x20 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 66x20
- chunk 1 (middle anchor) text run 1 at (207.00,18.00) startOffset 0 endOffset 5 width 66.00: "DRAFT"
+ RenderSVGText {text} at (205,2) size 70x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 69x20
+ chunk 1 (middle anchor) text run 1 at (205.50,18.00) startOffset 0 endOffset 5 width 69.00: "DRAFT"
Modified: trunk/LayoutTests/platform/wpe/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -140,6 +140,6 @@
RenderSVGRect {rect} at (0,0) size 800x600 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
RenderSVGContainer {g} at (0,0) size 800x38
RenderSVGRect {rect} at (0,0) size 800x36 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (207,2) size 66x20 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 66x20
- chunk 1 (middle anchor) text run 1 at (207.00,18.00) startOffset 0 endOffset 5 width 66.00: "DRAFT"
+ RenderSVGText {text} at (205,2) size 70x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 69x20
+ chunk 1 (middle anchor) text run 1 at (205.50,18.00) startOffset 0 endOffset 5 width 69.00: "DRAFT"
Modified: trunk/LayoutTests/platform/wpe/svg/hixie/error/012-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/svg/hixie/error/012-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/svg/hixie/error/012-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -9,7 +9,7 @@
text run at (0,0) width 324: "This page contains the following errors:"
RenderBlock {div} at (18,61) size 701x15
RenderText {#text} at (0,0) size 567x14
- text run at (0,0) width 567: "error on line 5 at column 7: Opening and ending tag mismatch: rect line 0 and svg"
+ text run at (0,0) width 567: "error on line 5 at column 7: Opening and ending tag mismatch: rect line 4 and svg"
text run at (567,0) width 0: " "
RenderBlock {h3} at (18,94) size 701x23
RenderText {#text} at (0,0) size 429x21
Modified: trunk/LayoutTests/platform/wpe/svg/text/text-altglyph-01-b-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/svg/text/text-altglyph-01-b-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/svg/text/text-altglyph-01-b-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -48,5 +48,3 @@
RenderSVGInlineText {#text} at (0,0) size 269x45
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 268.20: "$Revision: 1.5 $"
RenderSVGRect {rect} at (0,0) size 800x600 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
-selection start: position 0 of child 0 {#text} of child 1 {text} of child 13 {g} of child 32 {svg} of document
-selection end: position 16 of child 0 {#text} of child 15 {text} of child 32 {svg} of document
Modified: trunk/LayoutTests/platform/wpe/svg/text/text-text-04-t-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/svg/text/text-text-04-t-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/svg/text/text-text-04-t-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -242,5 +242,3 @@
RenderSVGInlineText {#text} at (0,0) size 289x45
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 288.60: "$Revision: 1.13 $"
RenderSVGRect {rect} at (0,0) size 800x600 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
-selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 15 {g} of child 15 {svg} of document
-selection end: position 17 of child 0 {#text} of child 17 {text} of child 15 {svg} of document
Modified: trunk/LayoutTests/platform/wpe/svg/text/text-text-06-t-expected.txt (282877 => 282878)
--- trunk/LayoutTests/platform/wpe/svg/text/text-text-06-t-expected.txt 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/LayoutTests/platform/wpe/svg/text/text-text-06-t-expected.txt 2021-09-22 16:37:27 UTC (rev 282878)
@@ -122,5 +122,3 @@
RenderSVGInlineText {#text} at (0,0) size 269x45
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 268.20: "$Revision: 1.9 $"
RenderSVGRect {rect} at (0,0) size 800x600 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
-selection start: position 0 of child 0 {#text} of child 1 {text} of child 1 {g} of child 5 {g} of child 3 {g} of child 12 {svg} of document
-selection end: position 16 of child 0 {#text} of child 5 {text} of child 12 {svg} of document
Modified: trunk/Source/WebKit/ChangeLog (282877 => 282878)
--- trunk/Source/WebKit/ChangeLog 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/Source/WebKit/ChangeLog 2021-09-22 16:37:27 UTC (rev 282878)
@@ -1,3 +1,12 @@
+2021-09-22 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] Switch runtime to 21.08 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=229919
+
+ Reviewed by Michael Catanzaro.
+
+ * Shared/RTCNetwork.h: Unified build fix, include <optional> before using std::optional<T>.
+
2021-09-22 Megan Gardner <megan_gard...@apple.com>
Remove unused enums.
Modified: trunk/Source/WebKit/Shared/RTCNetwork.h (282877 => 282878)
--- trunk/Source/WebKit/Shared/RTCNetwork.h 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/Source/WebKit/Shared/RTCNetwork.h 2021-09-22 16:37:27 UTC (rev 282878)
@@ -28,6 +28,7 @@
#if USE(LIBWEBRTC)
#include <WebCore/LibWebRTCMacros.h>
+#include <optional>
#include <webrtc/rtc_base/network.h>
#include <webrtc/rtc_base/socket_address.h>
#include <wtf/Forward.h>
Modified: trunk/Tools/ChangeLog (282877 => 282878)
--- trunk/Tools/ChangeLog 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/Tools/ChangeLog 2021-09-22 16:37:27 UTC (rev 282878)
@@ -1,3 +1,22 @@
+2021-09-22 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] Switch runtime to 21.08 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=229919
+
+ Reviewed by Michael Catanzaro.
+
+ Upgrade SDK runtime to the 21.08 branch.
+
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.setup_environ_for_server):
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.__init__):
+ (WebkitFlatpak.run_in_sandbox):
+ (WebkitFlatpak.main):
+ (WebkitFlatpak.check_installed_packages):
+ (WebkitFlatpak._get_dependency_packages):
+ (WebkitFlatpak.install_all):
+
2021-09-22 Carlos Garcia Campos <cgar...@igalia.com>
REGRESSION(r282082): [GTK] Tests timeout when using xvfb after r282082
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (282877 => 282878)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2021-09-22 16:37:27 UTC (rev 282878)
@@ -137,10 +137,11 @@
if self._should_use_jhbuild():
llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],
ignore_errors=True).strip()
+ dri_libgl_path = os.path.join(llvmpipe_libgl_path, "dri")
else: # in flatpak
llvmpipe_libgl_path = "/usr/lib/x86_64-linux-gnu/"
+ dri_libgl_path = os.path.join(llvmpipe_libgl_path, "GL", "lib", "dri")
- dri_libgl_path = os.path.join(llvmpipe_libgl_path, "dri")
if os.path.exists(os.path.join(llvmpipe_libgl_path, "libGL.so")) and os.path.exists(os.path.join(dri_libgl_path, "swrast_dri.so")):
# Make sure va-api support gets disabled because it's incompatible with Mesa's softGL driver.
environment['LIBVA_DRIVER_NAME'] = "null"
Modified: trunk/Tools/flatpak/flatpakutils.py (282877 => 282878)
--- trunk/Tools/flatpak/flatpakutils.py 2021-09-22 15:37:58 UTC (rev 282877)
+++ trunk/Tools/flatpak/flatpakutils.py 2021-09-22 16:37:27 UTC (rev 282878)
@@ -65,6 +65,10 @@
FLATPAK_USER_DIR_PATH = os.path.realpath(os.path.join(scriptdir, "../../WebKitBuild", "UserFlatpak"))
DEFAULT_SCCACHE_SCHEDULER='https://sccache.igalia.com'
+# Our SDK branch matches with the FDO SDK branch. When updating the FDO SDK release branch
+# in our SDK build definitions please don't forget to update the version here as well.
+SDK_BRANCH = "21.08"
+
is_colored_output_supported = False
try:
import curses
@@ -512,7 +516,6 @@
self.build_gst = False
- self.sdk_branch = "0.3"
self.platform = "gtk"
self.check_available = False
self.user_command = []
@@ -725,7 +728,7 @@
sandbox_build_path = os.path.join(self.sandbox_source_root, self.base_build_dir, self.build_type)
sandbox_environment = {
"TEST_RUNNER_INJECTED_BUNDLE_FILENAME": os.path.join(sandbox_build_path, "lib/libTestRunnerInjectedBundle.so"),
- "PATH": "/usr/lib/sdk/llvm11/bin:/usr/bin:/usr/lib/sdk/rust-stable/bin/",
+ "PATH": "/usr/lib/sdk/llvm12/bin:/usr/bin:/usr/lib/sdk/rust/bin/",
}
if not args:
@@ -993,7 +996,7 @@
for package in self._get_dependency_packages():
if package.name.startswith("org.webkit") \
and self.repos.is_package_installed(package.name) \
- and not self.repos.is_package_installed(package.name, branch=self.sdk_branch):
+ and not self.repos.is_package_installed(package.name, branch=SDK_BRANCH):
# Cache sccache auth token before removing UserFlatpak.
self.acquire_sccache_auth_token_from_config_file()
@@ -1136,7 +1139,7 @@
def check_installed_packages(self):
for package in self._get_dependency_packages():
- if package.name.startswith("org.webkit") and not package.is_installed(self.sdk_branch):
+ if package.name.startswith("org.webkit") and not package.is_installed(SDK_BRANCH):
Console.error_message("Flatpak package %s not installed. Please update your SDK: Tools/Scripts/update-webkit-flatpak", package)
return False
else:
@@ -1165,20 +1168,17 @@
def _get_dependency_packages(self):
arch = platform.machine()
- self.runtime = FlatpakPackage("org.webkit.Platform", self.sdk_branch,
+ self.runtime = FlatpakPackage("org.webkit.Platform", SDK_BRANCH,
self.sdk_repo, arch)
- self.sdk = FlatpakPackage("org.webkit.Sdk", self.sdk_branch,
+ self.sdk = FlatpakPackage("org.webkit.Sdk", SDK_BRANCH,
self.sdk_repo, arch)
packages = [self.runtime, self.sdk]
- packages.append(FlatpakPackage('org.webkit.Sdk.Debug', self.sdk_branch,
+ packages.append(FlatpakPackage('org.webkit.Sdk.Debug', SDK_BRANCH,
self.sdk_repo, arch))
-
- fdo_branch = "20.08"
- extensions = ("rust-stable", "llvm11")
- for name in extensions:
- packages.append(FlatpakPackage("org.freedesktop.Sdk.Extension.%s" % name, fdo_branch,
- self.flathub_repo, arch))
-
+ packages.append(FlatpakPackage("org.freedesktop.Sdk.Extension.llvm12", SDK_BRANCH,
+ self.flathub_repo, arch))
+ packages.append(FlatpakPackage("org.freedesktop.Platform.GL.default", SDK_BRANCH,
+ self.flathub_repo, arch))
return packages
def install_all(self):
@@ -1186,7 +1186,7 @@
return
Console.message("Installing %s dependencies in %s", self.build_type, self.flatpak_build_path)
for package in self._get_dependency_packages():
- if not package.is_installed(self.sdk_branch):
+ if not package.is_installed(SDK_BRANCH):
package.install()
def run_gdb(self):
