Changeset 725343af for general

Timestamp:

05/10/2020 02:22:58 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

336e6f5

Parents:

4c22625

Message:

Make a consolidated patch for gpm

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

File:

• general/sysutils/gpm.xml (modified) (2 diffs)

general/sysutils/gpm.xml

@@ -83 +83 @@
         <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>
@@ -115 +115 @@
 
     <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>