Changeset 88f20bb for x

Timestamp:

09/23/2018 10:39:01 PM (6 years ago)

Author:

Ken Moffat <ken@…>

Branches:

perl-modules

Children:

c9a326f

Parents:

6c71499

Message:

Perl modules branch: merge revisions 20505 to 20531 from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/perl-modules@20532 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

x/lib

Files:

• qt5.xml (modified) (2 diffs)
• qtwebengine.xml (modified) (2 diffs)
• webkitgtk.xml (modified) (5 diffs)

x/lib/qt5.xml

@@ -10 +10 @@
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "c6f0854d7de7bde80cfd8cc85bb7152b">
+  <!ENTITY qt5-md5sum        "152a8ade9c11fe33ff5bc95310a1bb64">
   <!ENTITY qt5-size          "467 MB">
-  <!ENTITY qt5-buildsize     "10.4 GB (234 MB installed)">
-  <!ENTITY qt5-time          "51 SBU (using parallelism=4)">
+  <!ENTITY qt5-buildsize     "11 GB (252 MB installed)">
+  <!ENTITY qt5-time          "23 SBU (using parallelism=4)">
 ]>
 
@@ -83 +83 @@
       <listitem>
         <para>Required Patch: <ulink
-        url="&patch-root;/qt-5.11.1-glibc228-1.patch"/></para>
+        url="&patch-root;/qt-&qt5-version;-glibc228-1.patch"/></para>
       </listitem>
     </itemizedlist>

x/lib/qtwebengine.xml

@@ -8 +8 @@
   <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "75d2ff31addba4ec41981b0f459cc587">
+  <!ENTITY qtwebengine-md5sum        "183b1e44bac4f70b54a77a9e569ff554">
   <!ENTITY qtwebengine-size          "223 MB">
-  <!ENTITY qtwebengine-buildsize     "3.5 GB (142 MB installed)">
-  <!ENTITY qtwebengine-time          "52 SBU (using 4 cores)">
+  <!ENTITY qtwebengine-buildsize     "3.6 GB (139 MB installed)">
+  <!ENTITY qtwebengine-time          "50 SBU (using 4 cores)">
 ]>
 
@@ -184 +184 @@
       plenty of RAM, running N+2 jobs (the ninja default for 4+ cores) for the
       large working sets of the C++ compiles in this package is typically only
-      marginally slower than running 4 jobs at a time.  But for a machine with
-      less memory it might be much slower.
+      marginally faster than running N jobs at a time.  But for a machine with
+      less memory it can be much slower.
     </para>
 

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        "72a05f6a4dc1c78b079590a8fd280401">
+  <!ENTITY webkitgtk-md5sum        "207d50d313c07b03726f3a7f22643934">
   <!ENTITY webkitgtk-size          "16 MB">
-  <!ENTITY webkitgtk-buildsize     "963 MB (128 MB installed)">
-  <!ENTITY webkitgtk-time          "18 SBU (using parallelism=4, 49 SBUs using one core)">
+  <!ENTITY webkitgtk-buildsize     "788 MB (128 MB installed)">
+  <!ENTITY webkitgtk-time          "16 SBU (using parallelism=4, 50 SBUs using one core)">
 ]>
 
@@ -125 +125 @@
     <application>WebKitGTK+</application></bridgehead>
 
-<!-- Remove for 8.2 (or 9.0) release -->
-    <caution>
-      <para>
-        You must rebuild <application>Perl</application> with -Dusethreads
-        if LFS was built without that option. LFS made this change in
-        April 2017.
-      </para>
-    </caution>
-
-<!--    <para>
-      First, fix a build issue with an invalid header path.
-    </para>
-
-<screen><userinput>sed -i '/Activity.h/s:WebCore/:&amp;platform/:' Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.h</userinput></screen>
--->
     <para>
       Install <application>WebKitGTK+</application> by running the
@@ -158 +143 @@
       -DENABLE_MINIBROWSER=ON     \
       -DUSE_WOFF2=OFF             \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
+      -Wno-dev -G Ninja .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -180 +165 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>ninja install &amp;&amp;
 
 install -vdm755 /usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0 &amp;&amp;
@@ -252 +237 @@
           jsc, 
           MiniBrowser, and
-          WebKitWebDriver <!-- New in 2.18.0 -->
+          WebKitWebDriver
         </seg>
         <seg>