Changeset ce9b131

Timestamp:

06/04/2016 04:19:32 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 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, nosym, 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:

bb535118

Parents:

f1ce80b

Message:

[systemd-merge] - Chapter 9 layout

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

Files:

• general/genlib/appstream-glib.xml (added)
• general/genlib/gcab.xml (added)
• general/genlib/genlib.xml (modified) (6 diffs)
• general/genlib/grantlee.xml (added)
• general/genlib/libmbim.xml (added)
• general/genlib/libnfsidmap.xml (added)
• general/genlib/libqmi.xml (added)
• general/genlib/libzeitgeist.xml (added)
• general/genlib/yaml.xml (added)
• packages.ent (modified) (4 diffs)

general/genlib/genlib.xml

@@ -44 +44 @@
   it is explained why you may want to install them.</para>
 
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream-glib.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
@@ -52 +55 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcab.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gobject-introspection.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/> -->
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
@@ -70 +80 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
-  <!--
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/>
-  -->
+-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
@@ -85 +95 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmbim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqmi.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigsegv.xml"/>
@@ -97 +114 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
@@ -113 +134 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
 
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yaml.xml"/>
 </chapter>

packages.ent

@@ -76 +76 @@
 <!-- Part III -->
 <!-- Chapter 9 -->
+<!ENTITY appstream-glib-version       "0.5.0">
 <!ENTITY apr-version                  "1.5.2">
 <!ENTITY apr-util-version             "1.5.4">
@@ -91 +92 @@
 <!ENTITY exempi-version               "2.3.0">
 <!ENTITY expat-version                "2.1.0">
+<!ENTITY gcab-version                 "0.7">
 <!ENTITY glib2-version                "2.48.1">
 <!ENTITY glibmm-version               "2.48.1">
 <!ENTITY gmime-version                "2.6.20">
 <!ENTITY gobject-introspection-version "1.48.0">
+<!ENTITY grantlee-version             "0.5.1">
 <!ENTITY gsl-version                  "2.1">
 
@@ -130 +133 @@
 <!ENTITY libksba-version              "1.3.4">
 <!ENTITY liblinear-version            "210">
+<!ENTITY libmbim-version              "1.12.2">
+<!ENTITY libnfsidmap-version          "0.26">
 <!ENTITY libpaper-version             "1.1.24+nmu4">
+<!ENTITY libqmi-version               "1.12.6">
 <!ENTITY libsigc-version              "2.8.0">
 <!ENTITY libsigsegv-version           "2.10">
@@ -159 +165 @@
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.2.23">
+<!ENTITY yaml-version                 "0.1.6">
 
 <!-- Chapter 10 -->