Changeset ba1f37b for general

Timestamp:

09/03/2014 06:19:11 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14686, systemd-13485

Children:

964366a

Parents:

89d4af6

Message:

Merged some changes from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14181 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general

Files:

• genlib/exempi.xml (modified) (3 diffs)
• genlib/genlib.xml (modified) (1 diff)
• genlib/libunistring.xml (modified) (2 diffs)
• genutils/appstream-glib.xml (moved) (moved from general/genlib/appstream-glib.xml ) (4 diffs)
• genutils/genutils.xml (modified) (1 diff)
• genutils/iso-codes.xml (modified) (1 diff)

general/genlib/exempi.xml

@@ -8 +8 @@
   <!ENTITY exempi-download-ftp  " ">
   <!ENTITY exempi-md5sum        "b55db1031a3b4609c2241f7fc870ce32">
-  <!ENTITY exempi-size          "3.2 MB">
-  <!ENTITY exempi-buildsize     "128 MB">
-  <!ENTITY exempi-time          "1.0 SBU">
+  <!ENTITY exempi-size          "3.3 MB">
+  <!ENTITY exempi-buildsize     "123 MB (additional 13 MB for the tests)">
+  <!ENTITY exempi-time          "less than 1.0 SBU (additional 0,3 SBU for the tests)">
 ]>
 
@@ -33 +33 @@
     Extensible Metadata Platform).</para>
 
-    &lfs76_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83 +83 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. If
+    <para>To test the results, issue: <command>make check</command>.<!--
     Valgrind is installed, mosts tests will indicate a failure, but
-    that is a test problem and not a package problem.</para>
+    that is a test problem and not a package problem.--></para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

general/genlib/genlib.xml

@@ -46 +46 @@
   <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"/>
-  <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="aspell.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boost.xml"/>

general/genlib/libunistring.xml

@@ -7 +7 @@
   <!ENTITY libunistring-download-http "http://ftp.gnu.org/gnu/libunistring/libunistring-&libunistring-version;.tar.gz">
   <!ENTITY libunistring-download-ftp "ftp://ftp.gnu.org/gnu/libunistring/libunistring-&libunistring-version;.tar.gz">
-  <!ENTITY libunistring-md5sum        "db8eca3b64163abadf8c40e5cecc261f">
-  <!ENTITY libunistring-size          "2.4 MB">
-  <!ENTITY libunistring-buildsize     "51 MB">
-  <!ENTITY libunistring-time          "0.9 SBU">
+  <!ENTITY libunistring-md5sum        "c24a6a3838d9ad4a41a62549312c4226">
+  <!ENTITY libunistring-size          "2.9 MB">
+  <!ENTITY libunistring-buildsize     "53 MB">
+  <!ENTITY libunistring-time          "1 SBU">
 ]>
 
@@ -104 +104 @@
         <seg>None</seg>
         <seg>libunistring.so</seg>
-        <seg>/usr/share/libunistring</seg>
+        <seg>/usr/share/doc/libunistring and /usr/share/libunistring</seg>
       </seglistitem>
     </segmentedlist>

general/genutils/appstream-glib.xml

@@ -13 +13 @@
   <!ENTITY appstream-glib-download-ftp  " ">
   <!ENTITY appstream-glib-md5sum        "925a056455b4eef441e692423ac0c5c5">
-  <!ENTITY appstream-glib-size          "1.4 MB">
-  <!ENTITY appstream-glib-buildsize     "16 MB">
-  <!ENTITY appstream-glib-time          "0.5 SBU ">
+  <!ENTITY appstream-glib-size          "1.6 MB">
+  <!ENTITY appstream-glib-buildsize     "14 MB (additional 1 MB for the tests)">
+  <!ENTITY appstream-glib-time          "0.3 SBU ">
 ]>
 
@@ -100 +100 @@
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>,
-      <xref linkend="gtk-doc"/>, and
-      <xref linkend="libxslt"/>
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libxslt"/>, and
+      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
     </para>
 
@@ -119 +120 @@
 
 <screen><userinput>./configure --prefix=/usr    \
---disable-static \
---disable-rpm    \
---enable-introspection=yes &amp;&amp;
+            --disable-static \
+            --disable-dep11  &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make -k check</command>. One test
+      fails, if <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
+      is not installed.
     </para>
 
@@ -146 +148 @@
 
     <para>
-      <parameter>--disable-rpm</parameter>: This disables rpm support
-      as rpm is not a part of BLFS.
-    </para>
-
-    <para>
-      <option>--enable-introspection=no</option>: Use this option if you
-       have not installed the recommended package <xref linkend="gobject-introspection"/>.
-    </para>
+      <parameter>--disable-dep11</parameter>: Remove this witch, if you have
+      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink> installed.
+    </para>
+
   </sect2>
 

general/genutils/genutils.xml

@@ -22 +22 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appdata-tools.xml"/>
+  <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="bogofilter-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>

general/genutils/iso-codes.xml

@@ -10 +10 @@
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "390291fa7ef954ca1feb4b3340d26c28">
-  <!ENTITY iso-codes-size          "3.6 MB">
+  <!ENTITY iso-codes-md5sum        "d032b2f9750bd59d350e0ccb060c8710">
+  <!ENTITY iso-codes-size          "3.7 MB">
   <!ENTITY iso-codes-buildsize     "110 MB">
   <!ENTITY iso-codes-time          "0.2 SBU (additional less than 0.1 SBU for the tests)">