From 725343afbd746ea73804804863d94698cf6fee89 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sun, 10 May 2020 14:22:58 +0000
Subject: [PATCH] Make a consolidated patch for gpm

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23089 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/sysutils/gpm.xml           | 16 ++++------------
 introduction/welcome/changelog.xml |  3 +++
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/general/sysutils/gpm.xml b/general/sysutils/gpm.xml
index a74db17e13..9ab72152b7 100644
--- a/general/sysutils/gpm.xml
+++ b/general/sysutils/gpm.xml
@@ -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>
@@ -113,22 +113,14 @@
   <sect2 role="installation">
     <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>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 183e5e7568..ce0669e40e 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <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>