Author: bdubbs
Date: Mon Aug 26 13:55:28 2013
New Revision: 11704

Log:
Add grantlee to the book. It is a required
dependency of kdepim.

Added:
   trunk/BOOK/kde/add/grantlee.xml   (contents, props changed)
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/add/add.xml
   trunk/BOOK/kde/add/kdepim.xml
   trunk/BOOK/kde/core/kdelibs.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Mon Aug 26 10:45:40 2013        (r11703)
+++ trunk/BOOK/general.ent      Mon Aug 26 13:55:28 2013        (r11704)
@@ -608,6 +608,7 @@
 <!ENTITY attica-version               "0.4.2">
 <!ENTITY qimageblitz-version          "0.0.6">
 <!ENTITY shared-desktop-ontologies-version "0.11.0">
+<!ENTITY grantlee-version             "0.3.0">
 <!ENTITY polkit-qt-version            "0.103.0">
 <!ENTITY polkit-kde-agent-version     "0.99.0">
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Mon Aug 26 10:45:40 
2013        (r11703)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Mon Aug 26 13:55:28 
2013        (r11704)
@@ -61,6 +61,10 @@
       <para>August 25th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Added grantlee-0.3.0.  It is now
+          a required dependency of kdepim.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to php-5.5.2.  Fixes
           <ulink url="&blfs-ticket-root;3983">#3983</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/kde/add/add.xml
==============================================================================
--- trunk/BOOK/kde/add/add.xml  Mon Aug 26 10:45:40 2013        (r11703)
+++ trunk/BOOK/kde/add/add.xml  Mon Aug 26 13:55:28 2013        (r11704)
@@ -20,6 +20,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="kmix.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libkcddb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="kdepim-runtime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="grantlee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="kdepim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libkexiv2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="kdeplasma-addons.xml"/>

Added: trunk/BOOK/kde/add/grantlee.xml
==============================================================================
Binary file. No diff available.

Modified: trunk/BOOK/kde/add/kdepim.xml
==============================================================================
--- trunk/BOOK/kde/add/kdepim.xml       Mon Aug 26 10:45:40 2013        (r11703)
+++ trunk/BOOK/kde/add/kdepim.xml       Mon Aug 26 13:55:28 2013        (r11704)
@@ -34,7 +34,7 @@
     calendar, mail client, newsreader, X.509 certificate manager
     and sticky notes.</para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -62,25 +62,25 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdepim-runtime"/>
+      <xref linkend="grantlee"/> and
+      <xref linkend="kdepim-runtime"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="nepomuk-widgets"/>,
-    <xref linkend="boost"/> and
-    <xref linkend="libassuan"/>
+      <xref linkend="nepomuk-widgets"/>,
+      <xref linkend="boost"/>, and
+      <xref linkend="libassuan"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink 
url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/";>Prison</ulink>,
-    <ulink url="http://www.gitorious.org/grantlee/pages/Home";>Grantlee</ulink> 
and
-    <ulink url="http://dblatex.sourceforge.net/";>dblatex</ulink>
+      <ulink 
url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/";>Prison</ulink>,
+      <ulink url="http://dblatex.sourceforge.net/";>dblatex</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdepim"/>
+      <ulink url="&blfs-wiki;/kdepim"/>
     </para>
 
   </sect2>
@@ -92,10 +92,11 @@
     the following commands:</para>
     
 <screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
+cd    build &amp;&amp;
+
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc \
-      -DCMAKE_BUILD_TYPE=Release \
+      -DSYSCONF_INSTALL_DIR=/etc         \
+      -DCMAKE_BUILD_TYPE=Release         \
       .. &amp;&amp;
 make</userinput></screen>
 

Modified: trunk/BOOK/kde/core/kdelibs.xml
==============================================================================
--- trunk/BOOK/kde/core/kdelibs.xml     Mon Aug 26 10:45:40 2013        (r11703)
+++ trunk/BOOK/kde/core/kdelibs.xml     Mon Aug 26 13:55:28 2013        (r11704)
@@ -32,7 +32,7 @@
     <para>This package includes programs and libraries that
     are central to development and execution of KDE programs.</para>
 
-    &lfs74_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -71,42 +71,42 @@
     <para role="required">
     <xref linkend="phonon"/>,
     <xref linkend="attica"/>,
-    <xref linkend="giflib"/>,
     <xref linkend="soprano"/>,
     <xref linkend="strigi"/>,
     <xref linkend="qca"/>,
     <xref linkend="libdbusmenu-qt"/>,
     <xref linkend="DocBook"/>,
     <xref linkend="docbook-xsl"/>,
-    <xref linkend="shared-desktop-ontologies"/> and
+    <xref linkend="shared-desktop-ontologies"/>, and
     <xref linkend="shared-mime-info"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="polkit-qt"/>,
-    <xref linkend="libpng"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="upower"/>, and
-    <xref linkend="udisks"/> or <xref linkend="udisks2"/>
+      <xref linkend="polkit-qt"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="giflib"/>,
+      <xref linkend="upower"/>, and
+      <xref linkend="udisks"/> or <xref linkend="udisks2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="jasper"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="avahi"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="acl"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="enchant"/>,
-    <ulink url="http://hspell.ivrix.org.il/";>Hspell</ulink>,
-    <ulink url="http://www.gitorious.org/grantlee/pages/Home";>Grantlee</ulink>,
-    <ulink url="http://oss.sgi.com/projects/fam/";>FAM</ulink>,
-    <ulink url="http://www.herqq.org/";>HUPnP</ulink>,
-    <xref linkend="mitkrb"/>,
-    <ulink url="http://www.openexr.com/";>OpenEXR</ulink> and
-    <ulink 
url="http://www.freedesktop.org/wiki/Software/media-player-info";>media-player-info</ulink>
+      <xref linkend="jasper"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="avahi"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="acl"/>,
+      <xref linkend="aspell"/>,
+      <xref linkend="enchant"/>,
+      <xref linkend="grantlee"/>,
+      <xref linkend="mitkrb"/>,
+      <ulink url="http://hspell.ivrix.org.il/";>Hspell</ulink>,
+      <ulink url="http://oss.sgi.com/projects/fam/";>FAM</ulink>,
+      <ulink url="http://www.herqq.org/";>HUPnP</ulink>,
+      <ulink url="http://www.openexr.com/";>OpenEXR</ulink>, and
+      <ulink 
url="http://www.freedesktop.org/wiki/Software/media-player-info";>media-player-info</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -123,7 +123,6 @@
 
 <screen><userinput>sed -i "s@{SYSCONF_INSTALL_DIR}/xdg/menus@&amp; RENAME 
kde-applications.menu@" \
         kded/CMakeLists.txt &amp;&amp;
-
 sed -i "[email protected]@kde-&amp;@" \
         kded/kbuildsycoca.cpp</userinput></screen>
 
@@ -133,8 +132,7 @@
 <!-- I wouldn't recommend installing D-Bus configuration files outside of /etc 
if kde-dir is /usr,
      maybe kde-etc-dir should be introduced? -->
 <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
+cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
       -DSYSCONF_INSTALL_DIR=/etc \
       -DCMAKE_BUILD_TYPE=Release \
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to