Changeset d503f9b


Ignore:
Timestamp:
05/27/2021 04:01:43 PM (4 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.0, lazarus, qt5new, trunk
Children:
e010adb
Parents:
55e4a54 (diff), fbfb998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/genlib.xml

    r55e4a54 rd503f9b  
    134134  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
    135135  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
     136  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwpe.xml"/>
    136137  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
    137138
     
    158159  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
    159160  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
     161  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpebackend-fdo.xml"/>
    160162  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
    161163  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
  • introduction/welcome/changelog.xml

    r55e4a54 rd503f9b  
    4343    -->
    4444    <listitem>
     45      <para>May 27th, 2021</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[renodr] - Update to WebKitGTK+-2.32.1. Fixes
     49          <ulink url="&blfs-ticket-root;15019">#15019</ulink>.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[renodr] - Add wpebackend-fdo to the book. Finishes
     53          <ulink url="&blfs-ticket-root;14913">#14913</ulink>.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[renodr] - Add libwpe to the book. Part of
     57          <ulink url="&blfs-ticket-root;14913">#14913</ulink>.</para>
     58        </listitem>
     59      </itemizedlist>
     60    </listitem>
     61
     62    <listitem>
    4563      <para>May 26th, 2021</para>
    4664      <itemizedlist>
  • networking/netlibs/curl.xml

    r55e4a54 rd503f9b  
    8484    </itemizedlist>
    8585-->
     86
    8687    <bridgehead renderas="sect3">cURL Dependencies</bridgehead>
    8788
  • packages.ent

    r55e4a54 rd503f9b  
    177177<!ENTITY libxslt-version              "1.1.34">
    178178<!ENTITY libwacom-version             "1.10">
     179<!ENTITY libwpe-version               "1.10.0">
    179180<!ENTITY lzo-version                  "2.10">
    180181<!ENTITY mtdev-version                "1.1.6">
     
    197198<!ENTITY wayland-version              "1.19.0">
    198199<!ENTITY wayland-protocols-version    "1.21">
     200<!ENTITY wpebackend-fdo-version       "1.8.4">
    199201<!ENTITY wv-version                   "1.2.9">
    200202<!ENTITY xapian-version               "1.4.18">
     
    768770<!ENTITY startup-notification-version "0.12">
    769771<!ENTITY tepl-version                 "6.00.0">
    770 <!ENTITY webkitgtk-version            "2.32.0">    <!-- Even minors only -->
     772<!ENTITY webkitgtk-version            "2.32.1">    <!-- Even minors only -->
    771773
    772774<!ENTITY gtk2-libdir                  "2.0/2.10.0">
  • x/lib/webkitgtk.xml

    r55e4a54 rd503f9b  
    77  <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
    88  <!ENTITY webkitgtk-download-ftp  " ">
    9   <!ENTITY webkitgtk-md5sum        "a24a9441ad01617be9ac95097cd31e08">
     9  <!ENTITY webkitgtk-md5sum        "b12790ae1209e1d5848aeb4fb70994db">
    1010  <!ENTITY webkitgtk-size          "22 MB">
    11   <!ENTITY webkitgtk-buildsize     "899 MB (127 MB installed)">
    12   <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 96 SBU using one core)">
     11  <!ENTITY webkitgtk-buildsize     "897 MB (127 MB installed)">
     12  <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 97 SBU using one core)">
    1313]>
    1414
     
    7272    </itemizedlist>
    7373
     74    <!--
    7475    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7576    <itemizedlist spacing="compact">
     
    8182      </listitem>
    8283    </itemizedlist>
     84    -->
    8385
    8486    <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
     
    100102      <xref linkend="openjpeg2"/>,
    101103      <xref linkend="ruby"/>,
    102       <xref linkend="sqlite"/>, and
    103       <xref linkend="which"/>
     104      <xref linkend="sqlite"/>,
     105      <xref linkend="which"/>, and
     106      <xref linkend="wpebackend-fdo"/>
    104107    </para>
    105108
     
    124127      <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
    125128      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>,
    126       <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>,
    127       <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink>,
    128       <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink>, and
     129      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>, and
    129130      <ulink url="https://github.com/flatpak/xdg-dbus-proxy">xdg-dbus-proxy</ulink>
    130131    </para>
     
    140141    <bridgehead renderas="sect3">Installation of
    141142    <application>WebKitGTK</application></bridgehead>
    142 
    143 <!--
    144     <para>First, ensure backward compatibility with the latest version of icu:</para>
    145 
    146 <screen><userinput>echo 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")' &gt;&gt; Source/WTF/wtf/CMakeLists.txt</userinput></screen>
    147 -->
    148 
    149     <!-- Needed for ICU-69.1 -->
    150     <para>
    151       First, fix building with ICU-69.1:
    152     </para>
    153 
    154 <screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-icu_69-1.patch</userinput></screen>
    155143
    156144    <para>
     
    171159      -DENABLE_MINIBROWSER=ON     \
    172160      -DUSE_WOFF2=OFF             \
    173       -DUSE_WPE_RENDERER=OFF      \
     161      -DUSE_WPE_RENDERER=ON       \
    174162      -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
    175163      -Wno-dev -G Ninja ..        &amp;&amp;
     
    188176      -DENABLE_MINIBROWSER=ON     \
    189177      -DUSE_WOFF2=OFF             \
    190       -DUSE_WPE_RENDERER=OFF      \
     178      -DUSE_WPE_RENDERER=ON       \
    191179      -DUSE_SYSTEMD=OFF           \
    192180      -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
     
    252240
    253241    <para>
    254       <parameter>-DUSE_WPE_RENDERER=OFF</parameter>: Remove this switch if the optional
    255       packages <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink> and
    256       <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink> are installed.
     242      <parameter>-DUSE_WPE_RENDERER=ON</parameter>: This switch uses the WPE
     243      renderer, which is recommended by upstream.
    257244    </para>
    258245
Note: See TracChangeset for help on using the changeset viewer.