Changeset dcdde93 for general/genutils

Timestamp:

05/27/2013 04:58:28 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

13e0a61

Parents:

a0dad2bf

Message:

Sync systemd branch.

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

Location:

general/genutils

Files:

• desktop-file-utils.xml (modified) (2 diffs)
• imagemagick.xml (modified) (5 diffs)
• pinentry.xml (modified) (9 diffs)
• screen.xml (modified) (2 diffs)
• tidy.xml (modified) (4 diffs)

general/genutils/desktop-file-utils.xml

@@ -34 +34 @@
       The <application>Desktop File Utils</application> package contains
       command line utilities for working with <ulink
-      url="http://www.freedesktop.org/Standards/desktop-entry-spec">
+      url="http://standards.freedesktop.org/desktop-entry-spec/latest/">
       Desktop entries</ulink>. These utilities are used by Desktop
       Environments and other applications to manipulate the MIME-types
@@ -125 +125 @@
       <para>
         The <ulink
-        url="http://freedesktop.org/wiki/Standards/basedir-spec">XDG Base
-        Directory</ulink> specification defines the standard locations for
-        applications to place data and configuration files. These files can
-        be used, for instance, to define the menu structure and menu items
-        in a desktop environment.
+        url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
+        Base Directory</ulink> specification defines the standard locations for
+        applications to place data and configuration files. These files can be
+        used, for instance, to define the menu structure and menu items in a
+        desktop environment.
       </para>
 

general/genutils/imagemagick.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "8">
+  <!ENTITY imagemagick-patch-version "6">
   <!-- Not sure what to do here as ImageMagick is one of the fastest-moving
        targets in all of open-source. One solution is to always use the last
@@ -16 +16 @@
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "c90d99ce0f0e08ebeab568eda7eedec7">
-  <!ENTITY imagemagick-size          "8.3 MB">
-  <!ENTITY imagemagick-buildsize     "450 MB (full build with all dependencies)">
-  <!ENTITY imagemagick-time          "5.0 SBU (full build - additional 20 SBU to run the test suite)">
+  <!ENTITY imagemagick-md5sum        "d2d03e8131722a5b85fc2a866d9df517">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "208 MB (with typical dependencies, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time          "1.9 SBU (typical build - additional 20 SBU to run the test suite)">
 ]>
 
@@ -29 +29 @@
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+     Saved the "full" 450MB as a comment - feel free to update this iff you
+     do build all dependencies, it's probably a lot bigger now.
 
      Also, please look over the output from the configure command for any
@@ -60 +62 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -133 +135 @@
       (you'll have to do some hacking to use <application>GnuPG</application>),
       <xref linkend="sane"/>,
-      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (only for raw formats listed in
+      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (for raw formats listed in
       <filename>www/formats.html</filename>),
       <xref linkend="wget"/>, and

general/genutils/pinentry.xml

@@ -7 +7 @@
   <!ENTITY pinentry-download-http " ">
   <!ENTITY pinentry-download-ftp  "ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.bz2">
-  <!ENTITY pinentry-md5sum        "82e6114e5e27a8ab36f314b332a6e024">
+  <!ENTITY pinentry-md5sum        "2ae681cbca0d9fb774b2c90b11ebf56c">
   <!ENTITY pinentry-size          "424 KB">
-  <!ENTITY pinentry-buildsize     "4.7 MB">
-  <!ENTITY pinentry-time          "less than 0.1 SBU">
+  <!ENTITY pinentry-buildsize     "12 MB">
+  <!ENTITY pinentry-time          "0.2 SBU">
 ]>
 
@@ -27 +27 @@
   </indexterm>
 
-  <!--Required section-->
   <sect2 role="package">
     <title>Introduction to PIN-Entry</title>
@@ -40 +39 @@
     environments, including interfaces designed for
     <application>Ncurses</application> (text-based),
-    <application>Gtk+</application>, <application>Gtk+-2</application>,
-    <application>Qt-3</application>, and <application>Qt-4</application>.</para>
-
-    &lfs72_checked;
+    <application>GTK+</application>, <application>GTK+2</application>,
+    <application>Qt3</application>, and <application>Qt4</application>.</para>
+
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67 +66 @@
     </itemizedlist>
 
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/pinentry-&pinentry-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
-
     <bridgehead renderas="sect3">PIN-Entry Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="GTK"/>, -->
-    <xref linkend="gtk2"/>,
-    <xref linkend="qt"/>, and
-    <xref linkend="libcap2"/></para>
+    <para role="optional">
+      <xref linkend="gtk2"/>,
+      <xref linkend="libcap2"/> and
+      <xref linkend="qt"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -126 +118 @@
 
   </sect2>
-
-  <!-- <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>-disable-...</parameter>: These three parameters are used
-    to fix a problem with the <command>configure</command> script if the
-    optional dependencies are not installed. If the dependencies are installed,
-    these parameters may be omitted.</para>
-
-  </sect2> -->
 
   <sect2 role="content">
@@ -183 +165 @@
         <term><command>pinentry-gtk</command></term>
         <listitem>
-          <para> is a <application>Gtk</application> GUI
+          <para> is a <application>GTK+</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-gtk">
@@ -194 +176 @@
         <term><command>pinentry-gtk-2</command></term>
         <listitem>
-          <para> is a <application>Gtk-2</application> GUI
+          <para> is a <application>GTK+2</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-gtk-2">
@@ -205 +187 @@
         <term><command>pinentry-qt</command></term>
         <listitem>
-          <para> is a <application>Qt-3</application> GUI
+          <para> is a <application>Qt3</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-qt">
@@ -216 +198 @@
         <term><command>pinentry-qt4</command></term>
         <listitem>
-          <para> is a <application>Qt-4</application> GUI
+          <para> is a <application>Qt4</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-qt4">

general/genutils/screen.xml

@@ -81 +81 @@
 <screen><userinput>./configure --prefix=/usr                     \
             --with-socket-dir=/var/run/screen \
-            --with-pty-group=4                \
+            --with-pty-group=5                \
             --with-sys-screenrc=/etc/screenrc                    &amp;&amp;
 sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &amp;&amp;
@@ -105 +105 @@
     class='directory'>/etc</filename>.  </para>
 
-    <para><parameter>--with-pty-group=4 </parameter>: This option sets the gid
+    <para><parameter>--with-pty-group=5</parameter>: This option sets the gid
     to the value used by LFS.</para>
 
-    <note><para>Newer versions of LFS use the value 5 for the tty group.  If
-    you are using the development version of LFS, change the pty-group option
-    to 5.</para></note>
+    <note><para>Older versions of LFS use the value 4 for the tty group. If
+    you are using LFS version 7.1 or older, change the pty-group option
+    to 4.</para></note>
 
     <para><command>sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%"

general/genutils/tidy.xml

@@ -83 +83 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -106 +106 @@
     the <filename class='directory'>api</filename> directory to
     <filename class='directory'>/usr/share/doc/tidy-&tidy-version;.</filename></para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -141 +149 @@
     <seglistitem>
     <seg>tab2space and tidy</seg>
-    <seg>libtidy.{so,a}</seg>
+    <seg>libtidy.so</seg>
     <seg>/usr/share/doc/tidy-&tidy-version;</seg>
     </seglistitem>
@@ -173 +181 @@
 
       <varlistentry id="libtidy">
-        <term><filename class='libraryfile'>libtidy.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libtidy.so</filename></term>
         <listitem>
-          <para>libraries provide the <application>HTML Tidy</application> API
+          <para>library provides the <application>HTML Tidy</application> API
           functions to <command>tidy</command> and can also be called by other
           programs.</para>
           <indexterm zone="html-tidy libtidy">
-            <primary sortas="c-libtidy">libtidy.{so,a}</primary>
+            <primary sortas="c-libtidy">libtidy.so</primary>
           </indexterm>
         </listitem>