Changeset 725bec7f

Timestamp:

04/04/2016 12:41:39 AM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

e9a42d7

Parents:

5327e48f

Message:

Update to qupzilla-2.0.0

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• lxqt/apps/qupzilla.xml (modified) (5 diffs)
• packages.ent (modified) (1 diff)
• x/lib/qt5.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to qupzilla-2.0.0. Fixes
+          <ulink url="&blfs-ticket-root;7659">#7669</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to iso-codes-3.67. Fixes
           <ulink url="&blfs-ticket-root;7677">#7677</ulink>.</para>

lxqt/apps/qupzilla.xml

@@ -8 +8 @@
        https://github.com/QupZilla/qupzilla/releases/download/v2.0.0/QupZilla-2.0.0.tar.xz
   -->
-  <!ENTITY qupzilla-download-http "&sources-anduin-http;/qupzilla/qupzilla-&qupzilla-version;.tar.gz">
+  <!ENTITY qupzilla-download-http "https://github.com/QupZilla/qupzilla/releases/download/v&qupzilla-version;/QupZilla-&qupzilla-version;.tar.xz">
   <!ENTITY qupzilla-download-ftp  " ">
-  <!ENTITY qupzilla-md5sum        "a39767aa92b482863ea4851935e26dd2">
-  <!ENTITY qupzilla-size          "4.3 MB">
-  <!ENTITY qupzilla-buildsize     "80 MB">
-  <!ENTITY qupzilla-time          "3.1 SBU">
+  <!ENTITY qupzilla-md5sum        "ecf2ddaf2538bc20bdca2867c57c7f7e">
+  <!ENTITY qupzilla-size          "2.7 MB">
+  <!ENTITY qupzilla-buildsize     "60 MB">
+  <!ENTITY qupzilla-time          "5.9 SBU">
 ]>
 
@@ -35 +35 @@
     <para>
       <application>QupZilla</application> is a fast, feature-rich and
-      lightweight <application>QtWebKit</application> based browser,
+      lightweight <application>QtWebEngine</application> based browser,
       originally intended only for educational purposes.
     </para>
@@ -82 +82 @@
       <xref linkend="cmake"/>,
       <xref linkend="openssl"/>, and
-      <xref linkend="qt5"/> or
-      <xref linkend="qt4"/>
+      <xref linkend="qt5"/> (with qtwebengine)
     </para>
 
@@ -103 +102 @@
 
     <para>
-      If <application>Qt4</application> and <application>Qt5</application> are
-      installed, choose which one you prefer, by running <command>source
-      setqt4</command> or <command>source setqt5</command>, respectivelly.
-    </para>
-
-    <para>
       Install <application>QupZilla</application> by running the following
       commands:
     </para>
 
-<screen><userinput>export QUPZILLA_PREFIX=/usr \
-       USE_WEBGL=true       &amp;&amp;
-
-qmake &amp;&amp;
-
+<screen><userinput>export QUPZILLA_PREFIX=/usr &amp;&amp;
+qmake                       &amp;&amp;
 make</userinput></screen>
 
     <para>
       The <command>export</command> command is used for configuring the build.
-      Alternatively, you can add each environment variable, one at a line, to
+      Alternatively, you can add the environment variable to
       <filename>src/defines.pri</filename>. The choice of <filename
       class="directory">/usr</filename> prefix is due to the general
@@ -211 +201 @@
         <listitem>
           <para>
-            is a lightweight <application>QtWebKit</application> web browser.
+            is a lightweight <application>QtWebEngine</application> web browser.
           </para>
           <indexterm zone="qupzilla qupzilla-prog">

packages.ent

@@ -661 +661 @@
 <!ENTITY qtermwidget-version          "0.6.0">
 <!ENTITY qterminal-version            "0.6.0">
-<!ENTITY qupzilla-version             "1.8.9">
+<!ENTITY qupzilla-version             "2.0.0">
 <!ENTITY qscintilla-version           "2.9.1">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">

x/lib/qt5.xml

@@ -12 +12 @@
   <!ENTITY qt5-md5sum        "47763c168f58b1196271b231f03c8bae">
   <!ENTITY qt5-size          "284 MB">
-  <!ENTITY qt5-buildsize     "7.2 GB (163 MB installed)">
-  <!ENTITY qt5-time          "19.7 SBU (using parallelism=4)">
+  <!ENTITY qt5-buildsize     "7.2 GB (163 MB installed, add 1.0 GB build size and 102 MB installed size for qtwebengine)">
+  <!ENTITY qt5-time          "19.7 SBU (using parallelism=4, add 19 SBU for qtwebengine)">
 ]>
 
@@ -413 +413 @@
 
     <para>
-      <parameter>-skip qtwebengine</parameter>: This switch disables
-      building the Qt Web Engine.  It is not presently used by
-      any applications. Note that building the Qt Web Engine increases the
-      build time and the installed size by almost 50%.
+      <parameter>-skip qtwebengine</parameter>: This switch disables building
+      the Qt Web Engine.  It is only used by <xref linkend='qupzilla'/> at this
+      writing.  Note that building the Qt Web Engine substantially increases
+      the build time and both the build and installed size.
     </para>