Changeset d503f9b

Timestamp:

05/27/2021 04:01:43 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• general/genlib/genlib.xml (modified) (2 diffs)
• general/genlib/libwpe.xml (added)
• general/genlib/wpebackend-fdo.xml (added)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netlibs/curl.xml (modified) (1 diff)
• packages.ent (modified) (3 diffs)
• x/lib/webkitgtk.xml (modified) (9 diffs)

general/genlib/genlib.xml

@@ -134 +134 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwpe.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
 
@@ -158 +159 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpebackend-fdo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>May 27th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to WebKitGTK+-2.32.1. Fixes
+          <ulink url="&blfs-ticket-root;15019">#15019</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add wpebackend-fdo to the book. Finishes
+          <ulink url="&blfs-ticket-root;14913">#14913</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add libwpe to the book. Part of
+          <ulink url="&blfs-ticket-root;14913">#14913</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 26th, 2021</para>
       <itemizedlist>

networking/netlibs/curl.xml

@@ -84 +84 @@
     </itemizedlist>
 -->
+
     <bridgehead renderas="sect3">cURL Dependencies</bridgehead>
 

packages.ent

@@ -177 +177 @@
 <!ENTITY libxslt-version              "1.1.34">
 <!ENTITY libwacom-version             "1.10">
+<!ENTITY libwpe-version               "1.10.0">
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.6">
@@ -197 +198 @@
 <!ENTITY wayland-version              "1.19.0">
 <!ENTITY wayland-protocols-version    "1.21">
+<!ENTITY wpebackend-fdo-version       "1.8.4">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.4.18">
@@ -768 +770 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY tepl-version                 "6.00.0">
-<!ENTITY webkitgtk-version            "2.32.0">    <!-- Even minors only -->
+<!ENTITY webkitgtk-version            "2.32.1">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">

x/lib/webkitgtk.xml

@@ -7 +7 @@
   <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "a24a9441ad01617be9ac95097cd31e08">
+  <!ENTITY webkitgtk-md5sum        "b12790ae1209e1d5848aeb4fb70994db">
   <!ENTITY webkitgtk-size          "22 MB">
-  <!ENTITY webkitgtk-buildsize     "899 MB (127 MB installed)">
-  <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 96 SBU using one core)">
+  <!ENTITY webkitgtk-buildsize     "897 MB (127 MB installed)">
+  <!ENTITY webkitgtk-time          "29 SBU (using parallelism=4, estimated 97 SBU using one core)">
 ]>
 
@@ -72 +72 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -81 +82 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
@@ -100 +102 @@
       <xref linkend="openjpeg2"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="which"/>
+      <xref linkend="sqlite"/>,
+      <xref linkend="which"/>, and
+      <xref linkend="wpebackend-fdo"/>
     </para>
 
@@ -124 +127 @@
       <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>, 
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>,
-      <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink>,
-      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink>, and
+      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>, and
       <ulink url="https://github.com/flatpak/xdg-dbus-proxy">xdg-dbus-proxy</ulink>
     </para>
@@ -140 +141 @@
     <bridgehead renderas="sect3">Installation of
     <application>WebKitGTK</application></bridgehead>
-
-<!--
-    <para>First, ensure backward compatibility with the latest version of icu:</para>
-
-<screen><userinput>echo 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")' &gt;&gt; Source/WTF/wtf/CMakeLists.txt</userinput></screen>
--->
-
-    <!-- Needed for ICU-69.1 -->
-    <para>
-      First, fix building with ICU-69.1:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-icu_69-1.patch</userinput></screen>
 
     <para>
@@ -171 +159 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_WPE_RENDERER=OFF      \
+      -DUSE_WPE_RENDERER=ON       \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
       -Wno-dev -G Ninja ..        &amp;&amp;
@@ -188 +176 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -DUSE_WPE_RENDERER=OFF      \
+      -DUSE_WPE_RENDERER=ON       \
       -DUSE_SYSTEMD=OFF           \
       -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
@@ -252 +240 @@
 
     <para>
-      <parameter>-DUSE_WPE_RENDERER=OFF</parameter>: Remove this switch if the optional 
-      packages <ulink url="https://github.com/WebPlatformForEmbedded/libwpe">libwpe</ulink> and
-      <ulink url="https://github.com/Igalia/WPEBackend-fdo">WPEBackend-fdo</ulink> are installed.
+      <parameter>-DUSE_WPE_RENDERER=ON</parameter>: This switch uses the WPE
+      renderer, which is recommended by upstream.
     </para>