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 @@ Required patch: - + @@ -113,22 +113,14 @@ Installation of GPM - - First, fix building with gcc-10.1 and later versions: - - -sed -e '/last_selection_time/s/^/extern /' \ - -i src/headers/daemon.h - Install GPM by running the following commands: -sed -i -e 's:<gpm.h>:"headers/gpm.h":' src/prog/{display-buttons,display-coords,get-versions}.c && -patch -Np1 -i ../gpm-&gpm-version;-glibc_2.26-1.patch && -./autogen.sh && -./configure --prefix=/usr --sysconfdir=/etc && +patch -Np1 -i ../gpm-&gpm-version;-consolidated-1.patch && +./autogen.sh && +./configure --prefix=/usr --sysconfdir=/etc && make 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 @@ May 10th, 2020 + + [pierre] - Make a consolidated patch for gpm. + [pierre] - Update to gcc-10.1.0. Partially fixes #13511.