Changeset 22275b6b for general/genutils/pinentry.xml

Timestamp:

10/04/2014 08:20:16 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

0ccf16ef

Parents:

0be2ac2f

Message:

Merged more updates from trunk.

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

File:

• general/genutils/pinentry.xml (modified) (9 diffs)

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        "2ae681cbca0d9fb774b2c90b11ebf56c">
-  <!ENTITY pinentry-size          "424 KB">
-  <!ENTITY pinentry-buildsize     "12 MB">
-  <!ENTITY pinentry-time          "0.2 SBU">
+  <!ENTITY pinentry-md5sum        "e2b6f94471ba1e978f6e5bf6b275189b">
+  <!ENTITY pinentry-size          "508 KB">
+  <!ENTITY pinentry-buildsize     "10 MB">
+  <!ENTITY pinentry-time          "0.1 SBU">
 ]>
 
@@ -82 +82 @@
     <title>Installation of PIN-Entry</title>
 
+    <para>If both <xref linkend="qt4"/> and <xref linkend="qt5"/> are
+    installed, use <command>source setqt4</command>, before starting.</para>
+
     <para>Install <application>PIN-Entry</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i 's:../../../s/pinentry/qt4/::' qt4/*.moc &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen><!-- &amp;&amp;
 
@@ -118 +122 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ... qt4/*.moc</command> Fix some header locations.
+    </para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -127 +140 @@
 
       <seglistitem>
-        <seg>pinentry, pinentry-curses, pinentry-gtk, pinentry-gtk-2,
-        pinentry-qt, and pinentry-qt4</seg>
+        <seg>pinentry (symlink), pinentry-curses, pinentry-gtk-2,
+          pinentry-qt4, and pinentry-tty</seg>
         <seg>None</seg>
         <seg>None<!--/usr/share/doc/pinentry-&pinentry-version;--></seg>
@@ -160 +173 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="pinentry-gtk">
         <term><command>pinentry-gtk</command></term>
@@ -170 +183 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="pinentry-gtk-2">
@@ -182 +195 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="pinentry-qt">
         <term><command>pinentry-qt</command></term>
@@ -192 +205 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="pinentry-qt4">
@@ -205 +218 @@
       </varlistentry>
 
+      <varlistentry id="pinentry-tty">
+        <term><command>pinentry-tty</command></term>
+        <listitem>
+          <para> is a <application>tty</application>
+          <application>PIN-Entry</application> program.</para>
+          <indexterm zone="pinentry pinentry-tty">
+            <primary sortas="b-pinentry-tty">pinentry-tty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>