Changeset cd602728 for general/genutils

Timestamp:

12/12/2015 03:36:07 PM (8 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

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

8c19ac9

Parents:

e2c88e8

Message:

• Update to stunnel-5.28.
• Update to Update to libnl-3.2.27.
• Update to stunnel-5.28.

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

File:

• general/genutils/pinentry.xml (modified) (6 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        "55439c4436b59573a29e144916ee5b61">
-  <!ENTITY pinentry-size          "504 KB">
-  <!ENTITY pinentry-buildsize     "7.9 MB (with <command>pinentry-qt4</command>)">
-  <!ENTITY pinentry-time          "0.1 SBU">
+  <!ENTITY pinentry-md5sum        "9510b2de013e818dab619e468298703a">
+  <!ENTITY pinentry-size          "424 KB">
+  <!ENTITY pinentry-buildsize     "10 MB">
+  <!ENTITY pinentry-time          "less than 0.1 SBU">
 ]>
 
@@ -70 +70 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="gcr"/>,
       <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/>,
       <xref linkend="libcap-pam"/>,
-      <xref linkend="libsecret"/>, and
-      <xref linkend="qt4"/>
+      <xref linkend="libsecret"/>,
+      <xref linkend="qt4"/>, and
+      <xref linkend="qt5"/>
     </para>
 
@@ -88 +91 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
+
 make</userinput></screen><!-- &amp;&amp;
 
@@ -124 +128 @@
 
     <para>
-      <option>--enable-pinentry-qt4</option>: Use this switch if you wish to
-      install <command>pinentry-qt4</command>.
-    </para>
-
-    <para>
-      <envar>CXXFLAGS=-std=c++11</envar>: If using
-      <option>--enable-pinentry-qt4</option> switch, add to the
-      <command>./configure ...</command> command line, to fix a build problem
-      with gcc-5.
-    </para>
-
-    <para>
-      <envar>MOC=$QT4DIR/bin/moc</envar>:  If using
-      <option>--enable-pinentry-qt4</option> switch, add to the
-      <command>./configure ...</command> command line, to help Qt4
-      <command>moc</command> (Qt4 meta object compiler) detection.
+      <option>--disable-pinentry-qt5</option>: Default is enable. Don't use qt5
+      even if it is available. If qt4 is found, <command>pinentry-qt</command>
+      will be linked to qt4.
+    </para>
+
+    <para>
+      <option>--enable-pinentry-qt=yes/no</option>: Default is yes.
+    </para>
+
+    <para>
+      <option>--enable-pinentry-gtk2=yes/no</option>: Default is yes. Even if
+      other <command>pinentry-*</command> is installed,
+      <command>pinentry</command> will be a symlink to
+      <command>pinentry-gtk-2</command>.
+    </para>
+
+    <para>
+      <option>--enable-pinentry-gnome3=yes/no</option>: Default is yes.
+      Actually, it is the gtk3 pinentry.
     </para>
 
@@ -155 +162 @@
         <seg>
           pinentry (symlink), pinentry-curses, pinentry-gnome3, pinentry-gtk-2,
-          pinentry-qt4, and pinentry-tty
+          pinentry-qt, and pinentry-tty
         </seg>
         <seg>None</seg>
@@ -211 +218 @@
       </varlistentry>
 
-      <varlistentry id="pinentry-qt4">
-        <term><command>pinentry-qt4</command></term>
-        <listitem>
-          <para> is a <application>Qt4</application>
-          <application>PIN-Entry</application> helper program.</para>
-          <indexterm zone="pinentry pinentry-qt4">
-            <primary sortas="b-pinentry-qt4">pinentry-qt4</primary>
+      <varlistentry id="pinentry-qt">
+        <term><command>pinentry-qt</command></term>
+        <listitem>
+          <para> is a <application>Qt4 or 5</application>
+          <application>PIN-Entry</application> helper program.</para>
+          <indexterm zone="pinentry pinentry-qt">
+            <primary sortas="b-pinentry-qt">pinentry-qt</primary>
           </indexterm>
         </listitem>