[blfs-book] r23089 - in trunk/BOOK: general/sysutils introduction/welcome

[pierre--- via blfs-book]

Author: pierre
Date: Sun May 10 07:22:58 2020
New Revision: 23089

Log:
Make a consolidated patch for gpm

Modified:
   trunk/BOOK/general/sysutils/gpm.xml
   trunk/BOOK/introduction/welcome/changelog.xml

Modified: trunk/BOOK/general/sysutils/gpm.xml
==============================================================================
--- trunk/BOOK/general/sysutils/gpm.xml Sun May 10 06:26:49 2020        (r23088)
+++ trunk/BOOK/general/sysutils/gpm.xml Sun May 10 07:22:58 2020        (r23089)
@@ -82,7 +82,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/gpm-&gpm-version;-glibc_2.26-1.patch"/>
+          <ulink url="&patch-root;/gpm-&gpm-version;-consolidated-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -114,21 +114,13 @@
     <title>Installation of GPM</title>
 
     <para>
-      First, fix building with gcc-10.1 and later versions:
-    </para>
-
-<screen><userinput>sed -e '/last_selection_time/s/^/extern /' \
-    -i src/headers/daemon.h</userinput></screen>
-
-    <para>
       Install <application>GPM</application> by running
       the following commands:
     </para>
 
-<screen><userinput>sed -i -e 's:&lt;gpm.h&gt;:"headers/gpm.h":' 
src/prog/{display-buttons,display-coords,get-versions}.c &amp;&amp;
-patch -Np1 -i ../gpm-&gpm-version;-glibc_2.26-1.patch &amp;&amp;
-./autogen.sh                                &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput>patch -Np1 -i ../gpm-&gpm-version;-consolidated-1.patch 
&amp;&amp;
+./autogen.sh                                     &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc      &amp;&amp;
 make</userinput></screen>
 
     <para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sun May 10 06:26:49 
2020        (r23088)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun May 10 07:22:58 
2020        (r23089)
@@ -45,6 +45,9 @@
       <para>May 10th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Make a consolidated patch for gpm.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to gcc-10.1.0. Partially fixes
           <ulink url="&blfs-ticket-root;13511">#13511</ulink>.</para>
         </listitem>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page