Attachment 408169 Details for Bug 216073 – Patch

[patch] Patch

bug-216073-20200907023554.patch (text/plain), 11.93 KB, created by Philippe Normand on 2020-09-07 02:35:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2020-09-07 02:35:56 PDT

Size: 11.93 KB

patch

obsolete

>Subversion Revision: 266695
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 601e8a76808e8447d777ae1a962cfcede24c5f20..b5f02c8805e3964b459ca489e1ade0b9e65e680c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+2020-09-02  Philippe Normand  <pnormand@igalia.com>
>+
>+        [Flatpak SDK] Migration to SDK 0.3 branch
>+        https://bugs.webkit.org/show_bug.cgi?id=216073
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        As this new SDK branch is based on the FDO 20.08 SDK which breaks ABI, existing WebKit
>+        builds done with the 0.2 branch will no longer be usable. Developers are advised to remove
>+        their WebKitBuild/{GTK,WPE} local directories after updating to 0.3.
>+
>+        * Scripts/webkitpy/port/gtk.py:
>+        (GtkPort.setup_environ_for_server): Since we now ship Mesa directly in the SDK we can easily
>+        configure the prefix where DRI modules are installed. This is now the same as in the JHBuild
>+        sysroot.
>+        * flatpak/flatpakutils.py:
>+        (WebkitFlatpak.__init__): Bump to 0.3 branch.
>+        (WebkitFlatpak._get_packages): The GL extension is no longer needed because Mesa is shipped
>+        directly within our SDK now.
>+
> 2020-09-06  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         Make GlyphBufferAdvance and GlyphBufferOrigin more robust
>diff --git a/Tools/Scripts/webkitpy/port/gtk.py b/Tools/Scripts/webkitpy/port/gtk.py
>index 97ced19775469992ebeb6e799ad2e72ed3c4c58e..31e439ddd4d8d80503932fac9fadf22de22aca98 100644
>--- a/Tools/Scripts/webkitpy/port/gtk.py
>+++ b/Tools/Scripts/webkitpy/port/gtk.py
>@@ -137,11 +137,10 @@ class GtkPort(Port):
>             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"
>diff --git a/Tools/flatpak/flatpakutils.py b/Tools/flatpak/flatpakutils.py
>index 539bbac84d1c3a72ec5e560c81af0abc165cc783..cd96ae4a214a520c4077e2e234e54bd7237e7642 100644
>--- a/Tools/flatpak/flatpakutils.py
>+++ b/Tools/flatpak/flatpakutils.py
>@@ -487,7 +487,7 @@ class WebkitFlatpak:
> 
>         self.build_gst = False
> 
>-        self.sdk_branch = "0.2"
>+        self.sdk_branch = "0.3"
>         self.platform = "gtk"
>         self.check_available = False
>         self.user_command = []
>@@ -978,14 +978,12 @@ class WebkitFlatpak:
>         packages.append(FlatpakPackage('org.webkit.Sdk.Debug', self.sdk_branch,
>                                        self.sdk_repo, arch))
> 
>-        # FIXME: For unknown reasons, the GL extension needs to be explicitely
>-        # installed for Flatpak 1.2.x to be able to make use of it. Seems like
>-        # it's not correctly inheriting it from the SDK.
>         self.flathub_repo = self.repos.add(FlatpakRepo("flathub", url="https://dl.flathub.org/repo/",
>                                                        repo_file="https://dl.flathub.org/repo/flathub.flatpakrepo"))
> 
>-        packages.append(FlatpakPackage("org.freedesktop.Platform.GL.default", "19.08",
>+        packages.append(FlatpakPackage("org.freedesktop.Sdk.Extension.rust-stable", "20.08",
>                                        self.flathub_repo, arch))
>+
>         return packages
> 
>     def install_all(self):
>diff --git a/Tools/flatpak/webkit-bwrap b/Tools/flatpak/webkit-bwrap
>index 31d3894e04c2a440a51ee5e8ae8ad55667234ceb..1238121bf0f7782db377da8c141d6c31c83d254e 100755
>--- a/Tools/flatpak/webkit-bwrap
>+++ b/Tools/flatpak/webkit-bwrap
>@@ -63,6 +63,8 @@ def main(args: list) -> int:
>             bwrap_args.extend(["--unsetenv", env])
>     bwrap_args.extend(["--setenv", "LANG", "en_US.UTF-8"])
> 
>+    bwrap_args.extend((["--setenv", "PATH", "/usr/bin:/usr/lib/sdk/rust-stable/bin/"]))
>+
>     command_line = ' '.join(shlex.quote(a) for a in bwrap_args + args)
>     # os.system return code behaves like os.wait. A 16 bit number with the
>     # signal in the lower byte and, if the signal is zero, the exit code in
>diff --git a/LayoutTests/fast/xsl/resources/xslt-enc-cyr.xsl b/LayoutTests/fast/xsl/resources/xslt-enc-cyr.xsl
>index fec7f48acdf3de6206655896b0805bc1dcd74fa1..4c47b5e2c5b671f73856fa1a822a7e93dd105829 100644
>--- a/LayoutTests/fast/xsl/resources/xslt-enc-cyr.xsl
>+++ b/LayoutTests/fast/xsl/resources/xslt-enc-cyr.xsl
>@@ -9,7 +9,7 @@
>         </html>
>   </xsl:template>
> 
>-<xsl:template >
>+<xsl:template name="foobar">
> 		<xsl:value-of select="." />
> </xsl:template>
> 
>diff --git a/LayoutTests/fast/xsl/resources/xslt-enc.xsl b/LayoutTests/fast/xsl/resources/xslt-enc.xsl
>index c0ec33b36a5a4d69b4a1d375de9d5c48059031a1..a618121db84d30c207e616aec21ddc510480424d 100644
>--- a/LayoutTests/fast/xsl/resources/xslt-enc.xsl
>+++ b/LayoutTests/fast/xsl/resources/xslt-enc.xsl
>@@ -12,7 +12,7 @@
>         </html>
>   </xsl:template>
> 
>-<xsl:template >
>+<xsl:template name="foobar">
> 		<xsl:value-of select="." />
> </xsl:template>
> 
>diff --git a/LayoutTests/fast/xsl/resources/xslt-enc16.xsl b/LayoutTests/fast/xsl/resources/xslt-enc16.xsl
>index fbce796bb54f835c3178f61c9ecc8278aeac771c..3718e37e1d231ebafc00a9e5b885d10f39ada5ce 100644
>--- a/LayoutTests/fast/xsl/resources/xslt-enc16.xsl
>+++ b/LayoutTests/fast/xsl/resources/xslt-enc16.xsl
>@@ -9,7 +9,7 @@
>         </html>
>   </xsl:template>
> 
>-<xsl:template >
>+<xsl:template name="foobar">
> 		<xsl:value-of select="." />
> </xsl:template>
> 
>diff --git a/LayoutTests/fast/xsl/resources/xslt-text.xsl b/LayoutTests/fast/xsl/resources/xslt-text.xsl
>index 1796937bd85f88e2eefeef74a013ffbacb291697..76ec4b071a1ba158a992c059f1c2f0a987d4f0b2 100644
>--- a/LayoutTests/fast/xsl/resources/xslt-text.xsl
>+++ b/LayoutTests/fast/xsl/resources/xslt-text.xsl
>@@ -5,7 +5,7 @@
> <xsl:template match="TEST">CHARACTERS IN XSLT: &lt;&lt;&lt;&amp;ÑÐµÑÑ&amp;>>&gt;
> <xsl:apply-templates/><xsl:text>&#10;</xsl:text></xsl:template>
> 
>-<xsl:template >
>+<xsl:template name="foobar">
> 		<xsl:value-of select="." />
> </xsl:template>
> 
>diff --git a/LayoutTests/platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt b/LayoutTests/platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f0c29d37c00f5f9598fcf7a96b0fe1d1f02a998d
>--- /dev/null
>+++ b/LayoutTests/platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt
>@@ -0,0 +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: html line 8 and xsl:template
>+
>+CONSOLE MESSAGE: Opening and ending tag mismatch: template line 8 and stylesheet
>+
>+CONSOLE MESSAGE: EndTag: '</' not found
>+
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>diff --git a/LayoutTests/platform/glib/fast/xsl/xslt-processor-expected.txt b/LayoutTests/platform/glib/fast/xsl/xslt-processor-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f0246d18c5f3881c06fcba072c4c83bd52670e77
>--- /dev/null
>+++ b/LayoutTests/platform/glib/fast/xsl/xslt-processor-expected.txt
>@@ -0,0 +1,121 @@
>+0.1 original xml:
>+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="xslt-text.xsl"?><TEST>SOURCE XML: &lt;&lt;&lt;&amp;ÑÐµÑÑ&amp;&gt;&gt;&gt;</TEST>
>+0.2 xsl1:
>+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
>+
>+<xsl:output method="text" encoding="KOI8-R"/>
>+<xsl:template match="TEST">CHARACTERS IN XSLT: &lt;&lt;&lt;&amp;ÑÐµÑÑ&amp;&gt;&gt;&gt;
>+<xsl:apply-templates/><xsl:text>
>+</xsl:text></xsl:template>
>+
>+<xsl:template name="foobar">
>+		<xsl:value-of select="."/>
>+</xsl:template>
>+
>+</xsl:stylesheet>
>+0.3 xsl2:
>+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
>+    <xsl:output method="html" encoding="UTF-8"/>
>+    <xsl:template match="TEST">
>+        <html xmlns="http://www.w3.org/1999/xhtml">
>+            <head>
>+                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
>+            </head>  
>+            <body>
>+              CHARACTERS IN XSLT: Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã© <br /> <xsl:apply-templates/>
>+            </body>
>+        </html>
>+  </xsl:template>
>+
>+<xsl:template name="foobar">
>+		<xsl:value-of select="."/>
>+</xsl:template>
>+
>+</xsl:stylesheet>
>+
>+1.0 void importStylesheet(in DOMNode style):
>+
>+1.1 Import two different stylesheets:
>+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /></head><body>
>+              CHARACTERS IN XSLT: Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã©Ã© <br /><br />SOURCE XML: &lt;&lt;&lt;&amp;ÑÐµÑÑ&amp;&gt;&gt;&gt;</body></html>
>+1.2 Import same stylesheet twice:
>+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml">
>+<head><title></title></head>
>+<body>
>+<pre>CHARACTERS IN XSLT: &lt;&lt;&lt;&amp;ÑÐµÑÑ&amp;&gt;&gt;&gt;
>+SOURCE XML: &lt;&lt;&lt;&amp;ÑÐµÑÑ&amp;&gt;&gt;&gt;</pre>
>+</body>
>+</html>
>+1.3 Import undefined stylesheet:
>+****Failure**** (expected exception, instead got result: "undefined")
>+1.4 Import undefined stylesheet:
>+****Failure**** (expected exception, instead got result: "undefined")
>+1.5 Don't import stylesheet:
>+Success
>+
>+2.0 DOMDocumentFragment transformToFragment(in DOMNode source, in DOMDocument output):
>+
>+2.1 fragment with undefined source:
>+****Failure**** (expected exception, instead got result: "null")
>+2.2 fragment with undefined output document:
>+Success
>+2.3 use non-DOMDocument output parameter:
>+Success
>+2.4 transform to same fragment twice:
>+Success
>+2.5 transformed fragment containing only text:
>+Success
>+2.6 fragment using passed parameters:
>+Success
>+
>+3.0 DOMDocument transformToDocument(in DOMNode source):
>+
>+3.1 use non-DOMDocument output parameter:
>+****Failure**** (expected exception, instead got result: "null")
>+3.2 transform twice:
>+Success
>+
>+4.0 void setParameter(in DOMString namespaceURI, in DOMString localName, in Value value):
>+
>+4.1 pass setParameter same localname, different namespaces:
>+****Failure**** (expected: "Success" actual: "Failure")
>+4.2 pass undefined namespace:
>+Success
>+4.3 pass setParameter an undefined name:
>+****Failure**** (expected exception, instead got result: "undefined")
>+4.4 pass unsupported value to setParameter:
>+****Failure**** (expected exception, instead got result: "undefined")
>+
>+5.0 Value getParameter(in DOMString namespaceURI, in DOMString localName):
>+
>+5.1 pass getParameter an undefined name:
>+****Failure**** (expected exception, instead got result: "null")
>+5.2 pass getParameter a name which has not been set:
>+Success
>+5.3 verify getParameter actually gets (and set sets):
>+Success
>+
>+6.0 void removeParameter(in DOMString namespaceURI, in DOMString localName):
>+
>+6.1 pass removeParameter same localname, different namespaces:
>+****Failure**** (expected: "Success" actual: "Failure")
>+6.2 verify removeParameter actually removes using undefined namespace:
>+Success
>+6.3 pass removeParameter undefined name:
>+Success
>+6.4 pass removeParameter a name which has not been set:
>+Success
>+6.5 verify removeParameter actually removes:
>+Success
>+
>+7.0 void clearParameters():
>+
>+7.1 verify that clearParameters does:
>+Success
>+
>+8.0 void reset():
>+
>+8.1 verify that parameters have been cleared:
>+Success
>+8.2 verify that stylesheet has been cleared:
>+Success

Actions: View | Formatted Diff | Diff

Attachments on bug 216073: 407768 | 408169 | 408319 | 408322