Author: ken
Date: Wed Jun 20 05:55:59 2018
New Revision: 20202

Log:
Add Falkon and archive QupZilla.

Added:
   trunk/BOOK/archive/qupzilla.xml
      - copied unchanged from r20201, trunk/BOOK/xsoft/graphweb/qupzilla.xml
   trunk/BOOK/xsoft/graphweb/falkon.xml   (contents, props changed)
Deleted:
   trunk/BOOK/xsoft/graphweb/qupzilla.xml
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/xsoft/graphweb/graphweb.xml

Copied: trunk/BOOK/archive/qupzilla.xml (from r20201, 
trunk/BOOK/xsoft/graphweb/qupzilla.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/BOOK/archive/qupzilla.xml     Wed Jun 20 05:55:59 2018        
(r20202, copy of r20201, trunk/BOOK/xsoft/graphweb/qupzilla.xml)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!-- https://github.com/QupZilla/qupzilla/tags 
+       
https://github.com/QupZilla/qupzilla/releases/download/v2.0.0/QupZilla-2.0.0.tar.xz
+  -->
+  <!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        "869448eadaef62f1b2e31bf038f33f52">
+  <!ENTITY qupzilla-size          "2.4 MB">
+  <!ENTITY qupzilla-buildsize     "81 MB">
+  <!ENTITY qupzilla-time          "5.4 SBU">
+]>
+
+<sect1 id="qupzilla" xreflabel="QupZilla-&qupzilla-version;">
+  <?dbhtml filename="qupzilla.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>QupZilla-&qupzilla-version;</title>
+
+  <indexterm zone="qupzilla">
+    <primary sortas="a-QupZilla">QupZilla</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to QupZilla</title>
+
+    <para>
+      <application>QupZilla</application> is a fast, feature-rich and
+      lightweight <application>QtWebEngine</application> based browser,
+      originally intended only for educational purposes.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qupzilla-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qupzilla-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qupzilla-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qupzilla-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qupzilla-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qupzilla-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">QupZilla Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="qtwebengine"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gdb"/>,
+<!--      <xref linkend="kdelibs"/> (KWallet plugin), -->
+      <!-- hunspell is only referenced in a few translations, and in a file
+      that seems to be used for app packaging, with a link to chromium
+      <ulink url="http://hunspell.sourceforge.net/";>Hunspell</ulink>, and -->
+      <ulink 
url="&gnome-download-ftp;/libgnome-keyring/">libgnome-keyring</ulink> 
(Gnome-Keyring plugin)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qupzilla"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of QupZilla</title>
+
+    <para>
+      Install <application>QupZilla</application> by running the following
+      commands:
+    </para>
+
+<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 the environment variable to
+      <filename>src/defines.pri</filename>. 
+    </para>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<!-- dev note: for "DESTDIR" install use "make INSTALL_ROOT=<dest> install" -->
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If <xref linkend="desktop-file-utils"/> and <xref linkend="xdg-utils"/>
+      are installed, run as, the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>xdg-icon-resource forceupdate --theme hicolor 
&amp;&amp;
+update-desktop-database -q</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <note>
+      <para>
+        If you wish to use any of the following variables, they need to be
+        exported.  You can add them to the <command>export</command> block in
+        the main instructions.  Alternatively, instead of exporting, they can
+        be added, one at a line, to <filename>src/defines.pri</filename>.
+      </para>
+    </note>
+
+    <para>
+      <envar>CONFIG += debug</envar>: Use if you want to build QupZilla with
+      debugging symbols.
+    </para>
+
+    <para>
+      <envar>GNOME_INTEGRATION=true</envar>: Enables Gnome integration, this
+      meaning the build of Gnome-Keyring Password plugin, which provides
+      support for storing passwords in Gnome-Keyring.
+    </para>
+
+    <!-- kwallet seems to be part of kde4 only
+    <para>
+      <envar>KDE_INTEGRATION=true</envar>: Enables KDE integration, this
+      meaning the build of KWallet Password plugin, which provides support for
+      storing passwords in KWallet.
+    </para> -->
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          qupzilla
+        </seg>
+        <seg>
+          libQupZilla.so and plugins under /usr/lib/qupzilla/
+        </seg>
+        <seg>
+          /usr/{lib,share}/qupzilla
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qupzilla-prog">
+        <term><command>qupzilla</command></term>
+        <listitem>
+          <para>
+            is a lightweight <application>QtWebEngine</application> web 
browser.
+          </para>
+          <indexterm zone="qupzilla qupzilla-prog">
+            <primary sortas="b-qupzilla">qupzilla</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libQupZilla">
+        <term><filename class="libraryfile">libQupZilla.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libQupZilla</application> API functions.
+          </para>
+          <indexterm zone="qupzilla libQupZilla">
+            <primary sortas="c-libQupZilla">libQupZilla.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Wed Jun 20 04:30:09 
2018        (r20201)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed Jun 20 05:55:59 
2018        (r20202)
@@ -45,6 +45,10 @@
       <para>June 20th, 2018</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Replace QupZilla by Falkon-3.0.1. Fixes
+          <ulink url="&blfs-ticket-root;10437">#10437</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to qtwebengine-5.11.1 (security fix). Fixes
           <ulink url="&blfs-ticket-root;10881">#10881</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Wed Jun 20 04:30:09 2018        (r20201)
+++ trunk/BOOK/packages.ent     Wed Jun 20 05:55:59 2018        (r20202)
@@ -734,6 +734,7 @@
 <!-- Chapter 43 -->
 <!ENTITY chromium-version             "64.0.3282.186">
 <!ENTITY epiphany-version             "3.28.1">
+<!ENTITY falkon-version               "3.0.1">
 <!ENTITY firefox-version              "60.0.2">
 <!ENTITY flashplayer-version          "27.0.0.187">
 <!ENTITY qupzilla-version             "2.2.6">

Added: trunk/BOOK/xsoft/graphweb/falkon.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/BOOK/xsoft/graphweb/falkon.xml        Wed Jun 20 05:55:59 2018        
(r20202)
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY falkon-download-http 
"https://download.kde.org/stable/falkon/&falkon-version;/falkon-&falkon-version;.tar.xz";>
+  <!ENTITY falkon-download-ftp  " ">
+  <!ENTITY falkon-md5sum        "c6fb6433ac0f228667e2f763c02317c5">
+  <!ENTITY falkon-size          "2.2 MB">
+  <!ENTITY falkon-buildsize     "147 MB">
+  <!ENTITY falkon-time          "3.4 SBU">
+]>
+
+<sect1 id="falkon" xreflabel="falkon-&falkon-version;">
+  <?dbhtml filename="falkon.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Falkon-&falkon-version;</title>
+
+  <indexterm zone="falkon">
+    <primary sortas="a-falkon">falkon</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to falkon</title>
+
+    <para>
+      <application>Falkon</application> is a KDE web browser using the 
QtWebEngine
+      rendering engine. It was previously known as 
<application>QupZilla</application>.
+      It aims to be a lightweight web browser available through all major 
platforms.
+    </para>
+
+    <para>
+      Although <application>falkon</application> is now part of KDE, it can be
+      installed without KDE (with the loss of 
<application>kwallet</application>
+      functionality, and of translations of the (not-installed) example
+      <command>hellopython.py</command> script).
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&falkon-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&falkon-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &falkon-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &falkon-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &falkon-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &falkon-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">falkon Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="extra-cmake-modules"/>,
+      <xref linkend="qtwebengine"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gnome-keyring"/>,
+      <xref linkend="kf5-frameworks"/>
+      (for ki18n if installing the translations of 
<command>hellopython.py</command>,
+      or for kwallet and its dependencies), and
+      <ulink
+      
url="http://download.qt.io/official_releases/QtForPython/pyside2/";>PySide2</ulink>
+      for experimental <application>Python</application> plugins (compiling 
this from
+      source is very slow).
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/falkon"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of falkon</title>
+
+    <para>
+      To set the prefix to match KDE (if that has been installed), or
+      else to install in <filename class="directory">/usr</filename>
+      run:
+    </para>
+
+<screen><userinput>test -n "${KF5_PREFIX}" &amp;&amp; export 
FALKON_PREFIX=${KF5_PREFIX} ||
+  export FALKON_PREFIX=/usr</userinput></screen>
+
+    <para>
+      Install <application>falkon</application> by running the following
+      commands:
+    </para>
+
+    <para>
+      Unless you have installed both PySide2 and ki18n, remove the translations
+      for the sample <command>hellopython.py</command> script:
+    </para>
+
+<screen><userinput>rm -rf po/</userinput></screen>
+
+    <para>
+      In case you wish to run the tests, fix one of them so that it will
+      work correctly with both Qt-5.10 and Qt-5.11:
+    </para>
+
+<screen><userinput>sed -i 's/"5.11.", 5) == 0 ? 1 : 2/"5.10.", 5) &gt;= 0 ? 2 
: 1/' \
+  autotests/webviewtest.cpp</userinput></screen>
+
+    <para>
+      Now build the program:
+    </para>
+
+<screen><userinput>./configure --prefix=$FALKON_PREFIX --disable-static 
&amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>. All
+      tests should pass. If any fail, the full results will be in
+      <filename>Testing/Temporary/LastTest.log</filename>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If you have installed <application>Pyside2</application> you will want to
+      examine the <command>hellopython.py</command> which is in the <filename
+      class="directory">scripts/</filename> directory, and perhaps copy it to
+      your home directory.
+    </para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i 's/"5.11.", 5) == 0 ? 1 : 2/"5.10.", 5) &gt;= 0 ? 2 : 
1/' ...</command>:
+      This test previously looked for QtWebengine-5.10 which had changed its
+      result compared to earlier versions. In the move to Qt-5.11 the version
+      was bumped but the results were swapped. Change it to examine if the 
version
+      is <emphasis>at least 5.10</emphasis>, and to swap the expected results 
back.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          falkon
+        </seg>
+        <seg>
+          libFalkonPrivate.so.3
+        </seg>
+        <seg>
+          ${FALKON_PREFIX}/lib/plugins, ${FALKON_PREFIX}/share/falkon.
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="falkon-prog">
+        <term><command>falkon</command></term>
+        <listitem>
+          <para>
+            is a web browser which uses qtwebengine.
+          </para>
+          <indexterm zone="falkon falkon-prog">
+            <primary sortas="b-falkon">falkon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libFalkonPrivate.so.3">
+        <term><filename 
class="libraryfile">libFalkonPrivate.so.3</filename></term>
+        <listitem>
+          <para>
+            contains functions used by falkon.
+          </para>
+          <indexterm zone="falkon libFalkonPrivate.so.3">
+            <primary 
sortas="c-libFalkonPrivate.so.3">libFalkonPrivate.so.3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>

Modified: trunk/BOOK/xsoft/graphweb/graphweb.xml
==============================================================================
--- trunk/BOOK/xsoft/graphweb/graphweb.xml      Wed Jun 20 04:30:09 2018        
(r20201)
+++ trunk/BOOK/xsoft/graphweb/graphweb.xml      Wed Jun 20 05:55:59 2018        
(r20202)
@@ -20,9 +20,9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="chromium.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="epiphany.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="falkon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="firefox.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="midori.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qupzilla.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="seamonkey.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="galeon.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="konq.xml"/> -->
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to