Changeset 640f4c21 for x/lib/qtwebkit5.xml

Timestamp:

06/01/2017 03:30:51 PM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:

a01d308

Parents:

d0db416

Message:

Update to qt-5.9.0. Includes qtwebkit and qtwebengine.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18776 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/lib/qtwebkit5.xml (modified) (4 diffs)

x/lib/qtwebkit5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qtwebkit-major "5.8">
+  <!ENTITY qtwebkit-major "5.9">
   <!ENTITY qtwebkit-url   "http://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;-final">
 
   <!ENTITY qtwebkit-download-http "&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
   <!ENTITY qtwebkit-download-ftp  " ">
-  <!ENTITY qtwebkit-md5sum        "60a6935aca4a7c553d0ec4646ceed3b4">
+  <!ENTITY qtwebkit-md5sum        "1fc0ed873cc9326b823a8a83126714f5">
   <!ENTITY qtwebkit-size          "34 MB">
-  <!ENTITY qtwebkit-buildsize     "766 MB (50 MB installed)">
+  <!ENTITY qtwebkit-buildsize     "668 MB (38 MB installed)">
   <!ENTITY qtwebkit-time          "11 SBU (using parallelism=4)">
 ]>
@@ -117 +117 @@
 <screen><userinput>patch -Np1 -i ../qtwebkit-&qtwebkit-version;-icu_59-1.patch</userinput></screen>
 
+    <para>If desired, adjust the build settings to avoid literally thousands
+    of unneeded warning messages:</para>
+
+<screen><userinput>sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
+    -i Tools/qmake/mkspecs/features/unix/default_pre.prf</userinput></screen>
+
     <para>
       Install <application>Qtwebkit</application> by running the following commands:
     </para>
 
-<screen><userinput>SAVEPATH=$PATH             &amp;&amp;
-export PATH=$PWD/bin:$PATH &amp;&amp;
-
-mkdir -p build        &amp;&amp;
+<screen><userinput>mkdir -p build        &amp;&amp;
 cd       build        &amp;&amp;
 
 qmake ../WebKit.pro   &amp;&amp;
-make                  &amp;&amp;
-
-export PATH=$SAVEPATH &amp;&amp;
-unset SAVEPATH </userinput></screen>
+make</userinput></screen>
 
     <para>
@@ -147 +147 @@
 
     <para>
-      Remove references to the build directory from the installed
-      <filename class="extension">.pc</filename> files by running
-      the following command as the
-      <systemitem class="username">root</systemitem> user:
+      Remove references to the build directory from installed 
+      profile include (pri) files by running the following
+      command as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>find $QT5DIR/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) and profile include (pri) files by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5DIR/ -name qt_lib_bootstrap_private.pri \
-   -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &amp;&amp;
-
-find $QT5DIR/ -name \*.prl \
+<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
 
@@ -171 +159 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>export PATH=$PWD/bin:$PATH</command>: sets a temporary path needed
-      to complete the build and install process.
-    </para>
 
     <para>