diff --git a/1001-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch b/1001-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch new file mode 100644 index 0000000000000000000000000000000000000000..90118906f244fce967bbcc60ea2e4674588a9fb9 --- /dev/null +++ b/1001-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch @@ -0,0 +1,41 @@ +From f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 19 Jan 2020 19:53:41 +0000 +Subject: [PATCH] src/headers/daemon.h: avoid redefinition of + 'last_selection_time' + +Noticed build failure on gcc-10 as: + +``` +gcc -L/home/slyfox/dev/git/gpm/src -o gpm mice.o ... report.o tools.o -lm +ld: twiddler.o:gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:gpm/src/headers/daemon.h:183: first defined here +ld: synaptics.o:git/gpm/src/headers/daemon.h:183: + multiple definition of `last_selection_time'; mice.o:git/gpm/src/headers/daemon.h:183: first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Signed-off-by: Sergei Trofimovich +--- + src/headers/daemon.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/headers/daemon.h b/src/headers/daemon.h +index a8936ad..24a1a97 100644 +--- a/src/headers/daemon.h ++++ b/src/headers/daemon.h +@@ -180,7 +180,7 @@ extern struct mouse_features mouse_table[3], + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; + + + +-- +1.8.3.1 diff --git a/gpm.spec b/gpm.spec index 9cfe207db5b7a7d88cd698bf7ef38e55116e7d33..674e80874d4a37ad4b908875d7d7d55bb8c33e80 100644 --- a/gpm.spec +++ b/gpm.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: A mouse server for the Linux console Name: gpm Version: 1.20.7 -Release: 17%{?dist} +Release: 17%{anolis_release}%{?dist} License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only Group: System Environment/Daemons URL: http://www.nico.schottelius.org/software/gpm/ @@ -30,6 +31,13 @@ Patch10: gpm-1.20.7-sysmacros.patch # Include patch from upstream pull request: https://github.com/telmich/gpm/pull/20 Patch11: gpm-1.20.7-sigemptyset.patch #Patch7: gpm-1.20.6-capability.patch + + +# Begin: Anolis customized patches +# backport patch from https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a +Patch1001: 1001-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch +# End: Anolis customized patches + Requires(post): systemd systemd-sysv info Requires(preun): systemd info Requires(postun): systemd @@ -92,6 +100,7 @@ mouse support to text-based Linux applications. #%%patch7 -p1 -b .capability +%patch1001 -p1 %build ./autogen.sh %configure @@ -169,6 +178,9 @@ fi %{_libdir}/libgpm.a %changelog +* Thu Dec 09 2021 Weitao Zhou 1.20.7-17.0.1 +- use extern in header files when declaring global variables for compatible gcc10 build + * Mon Jan 18 2021 Jiri Kucera - 1.20.7-17 - Put autogen.sh to proper place Related: #1854555