From 7d645679702f3c0a630a74cbd01ef1d032489b7b Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Thu, 7 Jul 2016 03:38:55 +0000
Subject: [PATCH] Remove liblxqt CK2 patch from systemd, reintroduce
 WebKitGTK-2.4.11 to SystemV, and add ModemManager, GeoClue2, libmbim, and
 libqmi for SystemV.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17562 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/libmbim.xml             |  2 +-
 general/genlib/libqmi.xml              |  2 +-
 general/sysutils/modemmanager.xml      |  2 +-
 introduction/welcome/changelog.xml     | 26 +++++++++++++++++++++++++-
 kde/kf5/kf5-frameworks.xml             |  2 +-
 lxqt/desktop/liblxqt.xml               |  8 ++++----
 networking/netlibs/geoclue2.xml        |  2 +-
 networking/netutils/networkmanager.xml |  5 +----
 x/lib/webkitgtk2.xml                   |  2 +-
 xfce/apps/midori.xml                   |  3 +--
 xsoft/other/gimp.xml                   |  3 +--
 11 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/general/genlib/libmbim.xml b/general/genlib/libmbim.xml
index 93c678b29f..049bb9730f 100644
--- a/general/genlib/libmbim.xml
+++ b/general/genlib/libmbim.xml
@@ -12,7 +12,7 @@
   <!ENTITY libmbim-time          "0.1 SBU (with tests)">
 ]>
 
-<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;" revision="systemd">
+<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;">
   <?dbhtml filename="libmbim.html"?>
 
   <sect1info>
diff --git a/general/genlib/libqmi.xml b/general/genlib/libqmi.xml
index c12d5c4bda..4471350733 100644
--- a/general/genlib/libqmi.xml
+++ b/general/genlib/libqmi.xml
@@ -12,7 +12,7 @@
   <!ENTITY libqmi-time          "0.4 SBU (with tests)">
 ]>
 
-<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;" revision="systemd">
+<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;">
   <?dbhtml filename="libqmi.html"?>
 
   <sect1info>
diff --git a/general/sysutils/modemmanager.xml b/general/sysutils/modemmanager.xml
index 86d90c298f..4fa768987c 100644
--- a/general/sysutils/modemmanager.xml
+++ b/general/sysutils/modemmanager.xml
@@ -12,7 +12,7 @@
   <!ENTITY ModemManager-time          "0.8 SBU (with tests)">
 ]>
 
-<sect1 id="ModemManager" xreflabel="ModemManager-&ModemManager-version;" revision="systemd">
+<sect1 id="ModemManager" xreflabel="ModemManager-&ModemManager-version;">
   <?dbhtml filename="ModemManager.html"?>
 
   <sect1info>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 1eff0995e8..3cfd46386d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,30 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>July 7th, 2016</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>Remove CK2 patch from liblxqt.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>Reintroduce WebkitGTK-2.4.11.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>Add GeoClue2-2.4.3.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>Add ModemManager-1.4.14.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>Add libmbim-1.12.4.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>Add libqmi-1.14.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 6th, 2016</para>
       <itemizedlist>
@@ -83,7 +107,7 @@
       </itemizedlist>
     </listitem>
 
-    <listitem revision="systemd">
+    <listitem>
       <para>July 6th, 2016</para>
       <itemizedlist>
         <listitem>
diff --git a/kde/kf5/kf5-frameworks.xml b/kde/kf5/kf5-frameworks.xml
index bd97ae58ab..1c73c0af62 100644
--- a/kde/kf5/kf5-frameworks.xml
+++ b/kde/kf5/kf5-frameworks.xml
@@ -91,7 +91,7 @@
   <bridgehead renderas="sect4">Optional</bridgehead>
   <para role="optional">
     <xref linkend="bluez"/> (needed to build Bluez-Qt),
-    <ulink url="http://www.freedesktop.org/software/ModemManager/">ModemManager</ulink> (needed to build ModemManager-Qt)
+    <xref linkend="ModemManager"/> (needed to build ModemManager-Qt)
   </para>
 
   <bridgehead renderas="sect4">Runtime dependency for FrameworkIntegration</bridgehead>
diff --git a/lxqt/desktop/liblxqt.xml b/lxqt/desktop/liblxqt.xml
index 9d3e133fd2..ad5369d644 100644
--- a/lxqt/desktop/liblxqt.xml
+++ b/lxqt/desktop/liblxqt.xml
@@ -70,8 +70,8 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
+    <bridgehead renderas="sect3" revision="sysv">edditional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
       <listitem>
         <para>
           Optional patch, which adds <quote>Hibernate</quote> and
@@ -98,12 +98,12 @@
   <sect2 role="installation">
     <title>Installation of liblxqt</title>
 
-    <para>
+    <para revision="sysv">
       Optionally apply the following patch to be able to put your system
       into <quote>Suspend</quote> or <quote>Hibernate</quote> state.
     </para>
 
-<screen><userinput>patch -p1 -i ../liblxqt-&liblxqt-version;-hibernate_consolekit-1.patch</userinput></screen>
+<screen revision="sysv"><userinput>patch -p1 -i ../liblxqt-&liblxqt-version;-hibernate_consolekit-1.patch</userinput></screen>
 
     <para>
       Install <application>liblxqt</application> by running the
diff --git a/networking/netlibs/geoclue2.xml b/networking/netlibs/geoclue2.xml
index 9fb95cbb17..28a7339621 100644
--- a/networking/netlibs/geoclue2.xml
+++ b/networking/netlibs/geoclue2.xml
@@ -13,7 +13,7 @@
   <!ENTITY geoclue2-time          "0.2 SBU">
 ]>
 
-<sect1 id="geoclue2" xreflabel="GeoClue-&geoclue2-version;" revision="systemd">
+<sect1 id="geoclue2" xreflabel="GeoClue-&geoclue2-version;">
   <?dbhtml filename="geoclue2.html"?>
 
   <sect1info>
diff --git a/networking/netutils/networkmanager.xml b/networking/netutils/networkmanager.xml
index ca5f06dcb2..5b166d93fd 100644
--- a/networking/netutils/networkmanager.xml
+++ b/networking/netutils/networkmanager.xml
@@ -115,13 +115,10 @@
       <xref linkend="bluez"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="qt5"/> (for examples),
-      <phrase revision="systemd"><xref linkend="ModemManager"/>,</phrase>
+      <xref linkend="ModemManager"/>,
       <phrase revision="systemd"><xref linkend="pygobject3"/>,</phrase>
       <xref linkend="valgrind"/>,
       <ulink url="http://libteam.org/">libteam</ulink>,
-      <phrase revision="sysv"><ulink 
-      url="http://www.freedesktop.org/software/ModemManager/">
-      ModemManager</ulink>,</phrase>
       <ulink url="https://www.samba.org/ftp/ppp/">PPP</ulink>, and
       <ulink url="https://www.roaringpenguin.com/products/pppoe">RP-PPPoE</ulink>
     </para>
diff --git a/x/lib/webkitgtk2.xml b/x/lib/webkitgtk2.xml
index 95e9957f8a..0d1f3f2d8b 100644
--- a/x/lib/webkitgtk2.xml
+++ b/x/lib/webkitgtk2.xml
@@ -12,7 +12,7 @@
   <!ENTITY webkitgtk2-time          "80 SBU (using parallelism=4, both built, webkitgtk-3.0 takes a little longer than webkitgtk-1.0)">
 ]>
 
-<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;" revision="systemd">
+<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
   <?dbhtml filename="webkitgtk2.html"?>
 
   <sect1info>
diff --git a/xfce/apps/midori.xml b/xfce/apps/midori.xml
index d020eae7b8..73e2783c47 100644
--- a/xfce/apps/midori.xml
+++ b/xfce/apps/midori.xml
@@ -91,8 +91,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/>,
-      <!--<xref linkend="webkitgtk2"/>, and -->
-      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.x</ulink>, and
+      <xref linkend="webkitgtk2"/>, and
       <ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink>
     </para>
 
diff --git a/xsoft/other/gimp.xml b/xsoft/other/gimp.xml
index 4d69786734..c4233eb864 100644
--- a/xsoft/other/gimp.xml
+++ b/xsoft/other/gimp.xml
@@ -146,8 +146,7 @@
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
       <xref linkend="gtk-doc"/>, 
-      <!--xref linkend="webkitgtk2"/> (required for the help-plugin) and-->
-      <ulink url="http://webkitgtk.org/releases/">WebKitGTK+-2.4.x</ulink> (required for the help-plugin), and
+      <xref linkend="webkitgtk2"/> (required for the help-plugin) and
       <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
     </para>