Changeset 267010 in webkit


Ignore:
Timestamp:
Sep 14, 2020 2:51:24 AM (4 years ago)
Author:
Philippe Normand
Message:

[Flatpak SDK] Migration to SDK 0.3 branch
​https://bugs.webkit.org/show_bug.cgi?id=216073

Reviewed by Adrian Perez de Castro.

Tools:

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. Also un-hardcode host platform architecture so
that we can more easily add aarch64 bots later.
(WebkitFlatpak._get_packages): The GL extension is no longer needed because Mesa is shipped
directly within our SDK now. Also install the rust extension, which is useful eg when doing
development with gst-build.

  • flatpak/webkit-bwrap: Add rustc path in PATH.

LayoutTests:

  • fast/xsl/resources/xslt-enc-cyr.xsl: Add name attribute in xsl templates, as mandated by the spec.
  • fast/xsl/resources/xslt-enc.xsl: Ditto.
  • fast/xsl/resources/xslt-enc16.xsl: Ditto.
  • fast/xsl/resources/xslt-text.xsl: Ditto.
  • platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt: Added.
  • platform/glib/fast/xsl/xslt-processor-expected.txt: Added.
Location:
trunk
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r267008 r267010  
     12020-09-14  Philippe Normand  <pnormand@igalia.com>
     2
     3        [Flatpak SDK] Migration to SDK 0.3 branch
     4        https://bugs.webkit.org/show_bug.cgi?id=216073
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        * fast/xsl/resources/xslt-enc-cyr.xsl: Add name attribute in xsl templates, as mandated by the spec.
     9        * fast/xsl/resources/xslt-enc.xsl: Ditto.
     10        * fast/xsl/resources/xslt-enc16.xsl: Ditto.
     11        * fast/xsl/resources/xslt-text.xsl: Ditto.
     12        * platform/glib/fast/xsl/xslt-mismatched-tags-in-xslt-expected.txt: Added.
     13        * platform/glib/fast/xsl/xslt-processor-expected.txt: Added.
     14
    1152020-09-14  Myles C. Maxfield  <mmaxfield@apple.com>
    216

  • trunk/LayoutTests/fast/xsl/resources/xslt-enc-cyr.xsl

    r11962 r267010  
    1010  </xsl:template>
    1111
    12 <xsl:template >
     12<xsl:template name="foobar">
    1313                <xsl:value-of select="." />
    1414</xsl:template>

  • trunk/LayoutTests/fast/xsl/resources/xslt-enc.xsl

    r11962 r267010  
    1313  </xsl:template>
    1414
    15 <xsl:template >
     15<xsl:template name="foobar">
    1616                <xsl:value-of select="." />
    1717</xsl:template>

  • trunk/LayoutTests/fast/xsl/resources/xslt-enc16.xsl

    r11962 r267010  
    1010  </xsl:template>
    1111
    12 <xsl:template >
     12<xsl:template name="foobar">
    1313                <xsl:value-of select="." />
    1414</xsl:template>

  • trunk/LayoutTests/fast/xsl/resources/xslt-text.xsl

    r29920 r267010  
    66<xsl:apply-templates/><xsl:text>&#10;</xsl:text></xsl:template>
    77
    8 <xsl:template >
     8<xsl:template name="foobar">
    99                <xsl:value-of select="." />
    1010</xsl:template>

  • trunk/LayoutTests/fast/xsl/xslt-processor-expected.txt

    r212201 r267010  
    99</xsl:text></xsl:template>
    1010
    11 <xsl:template>
     11<xsl:template name="foobar">
    1212                <xsl:value-of select="."/>
    1313</xsl:template>
    … …  
    2828  </xsl:template>
    2929
    30 <xsl:template>
     30<xsl:template name="foobar">
    3131                <xsl:value-of select="."/>
    3232</xsl:template>

  • trunk/Tools/ChangeLog

    r266997 r267010  
     12020-09-14  Philippe Normand  <pnormand@igalia.com>
     2
     3        [Flatpak SDK] Migration to SDK 0.3 branch
     4        https://bugs.webkit.org/show_bug.cgi?id=216073
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        As this new SDK branch is based on the FDO 20.08 SDK which breaks ABI, existing WebKit
     9        builds done with the 0.2 branch will no longer be usable. Developers are advised to remove
     10        their WebKitBuild/{GTK,WPE} local directories after updating to 0.3.
     11
     12        * Scripts/webkitpy/port/gtk.py:
     13        (GtkPort.setup_environ_for_server): Since we now ship Mesa directly in the SDK we can easily
     14        configure the prefix where DRI modules are installed. This is now the same as in the JHBuild
     15        sysroot.
     16        * flatpak/flatpakutils.py:
     17        (WebkitFlatpak.__init__): Bump to 0.3 branch. Also un-hardcode host platform architecture so
     18        that we can more easily add aarch64 bots later.
     19        (WebkitFlatpak._get_packages): The GL extension is no longer needed because Mesa is shipped
     20        directly within our SDK now. Also install the rust extension, which is useful eg when doing
     21        development with gst-build.
     22        * flatpak/webkit-bwrap: Add rustc path in PATH.
     23
    1242020-09-13  Alexey Proskuryakov  <ap@apple.com>
    225

  • trunk/Tools/Scripts/webkitpy/port/gtk.py

    r266638 r267010  
    138138                llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],
    139139                                                                    ignore_errors=True).strip()
    140                 dri_libgl_path = os.path.join(llvmpipe_libgl_path, "dri")
    141140            else:  # in flatpak
    142141                llvmpipe_libgl_path = "/usr/lib/x86_64-linux-gnu/"
    143                 dri_libgl_path = os.path.join(llvmpipe_libgl_path, "GL", "lib", "dri")
    144 
     142
     143            dri_libgl_path = os.path.join(llvmpipe_libgl_path, "dri")
    145144            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")):
    146145                # Make sure va-api support gets disabled because it's incompatible with Mesa's softGL driver.

  • trunk/Tools/flatpak/flatpakutils.py

    r266455 r267010  
    3434import tempfile
    3535import re
     36import platform
    3637
    3738from webkitpy.common.system.logutils import configure_logging
    … …  
    488489        self.build_gst = False
    489490
    490         self.sdk_branch = "0.2"
     491        self.sdk_branch = "0.3"
    491492        self.platform = "gtk"
    492493        self.check_available = False
    … …  
    969970
    970971    def _get_packages(self):
    971         # FIXME: Make arch configurable.
    972         arch = "x86_64"
     972        arch = platform.machine()
    973973        self.runtime = FlatpakPackage("org.webkit.Platform", self.sdk_branch,
    974974                                      self.sdk_repo, arch)
    … …  
    979979                                       self.sdk_repo, arch))
    980980
    981         # FIXME: For unknown reasons, the GL extension needs to be explicitely
    982         # installed for Flatpak 1.2.x to be able to make use of it. Seems like
    983         # it's not correctly inheriting it from the SDK.
    984981        self.flathub_repo = self.repos.add(FlatpakRepo("flathub", url="https://dl.flathub.org/repo/",
    985982                                                       repo_file="https://dl.flathub.org/repo/flathub.flatpakrepo"))
    986983
    987         packages.append(FlatpakPackage("org.freedesktop.Platform.GL.default", "19.08",
     984        packages.append(FlatpakPackage("org.freedesktop.Sdk.Extension.rust-stable", "20.08",
    988985                                       self.flathub_repo, arch))
     986
    989987        return packages
    990988

  • trunk/Tools/flatpak/webkit-bwrap

    r263397 r267010  
    6464    bwrap_args.extend(["--setenv", "LANG", "en_US.UTF-8"])
    6565
     66    bwrap_args.extend((["--setenv", "PATH", "/usr/bin:/usr/lib/sdk/rust-stable/bin/"]))
     67
    6668    command_line = ' '.join(shlex.quote(a) for a in bwrap_args + args)
    6769    # os.system return code behaves like os.wait. A 16 bit number with the
Note: See TracChangeset for help on using the changeset viewer.