diff --git a/x3270-3.6-gcc10.patch b/x3270-3.6-gcc10.patch new file mode 100644 index 0000000..7580fe7 --- /dev/null +++ b/x3270-3.6-gcc10.patch @@ -0,0 +1,23 @@ +diff -up suite3270-3.6/x3270/screen.c.me suite3270-3.6/x3270/screen.c +diff -up suite3270-3.6/x3270/xscreen.h.me suite3270-3.6/x3270/xscreen.h +--- suite3270-3.6/x3270/xscreen.h.me 2020-02-05 21:11:35.635013942 +0100 ++++ suite3270-3.6/x3270/xscreen.h 2020-02-05 21:15:27.437340812 +0100 +@@ -163,5 +163,5 @@ struct font_list { + struct font_list *next; + char *mlabel; + }; +-struct font_list *font_list; +-int font_count; ++extern struct font_list *font_list; ++extern int font_count; +diff -up suite3270-3.6/include/glue.h.me suite3270-3.6/include/glue.h +--- suite3270-3.6/include/glue.h.me 2020-02-05 21:22:25.274825729 +0100 ++++ suite3270-3.6/include/glue.h 2020-02-05 21:22:46.882066351 +0100 +@@ -49,5 +49,5 @@ typedef bool merge_profile_t(void); + void register_merge_profile(merge_profile_t *); + + /* XtGlue.c */ +-void (*Error_redirect)(const char *); +-void (*Warning_redirect)(const char *); ++extern void (*Error_redirect)(const char *); ++extern void (*Warning_redirect)(const char *); diff --git a/x3270.spec b/x3270.spec index 1218322..f105b3c 100644 --- a/x3270.spec +++ b/x3270.spec @@ -4,7 +4,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 3.6ga8 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD URL: http://x3270.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz @@ -13,6 +13,7 @@ Source2: x3270.desktop Patch0: x3270-3.5-paths.patch Patch1: x3270-3.5-ibmhostpath.patch Patch2: x3270-3.5-odr.patch +Patch3: x3270-3.6-gcc10.patch BuildRequires: ncurses-devel BuildRequires: readline-devel @@ -62,6 +63,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM %patch0 -p1 -b .paths %patch1 -p1 -b .ibmhosts %patch2 -p1 +%patch3 -p1 for d in c3270 pr3287 s3270 x3270; do for f in LICENSE README html; do @@ -128,6 +130,9 @@ desktop-file-install \ %changelog +* Wed Feb 05 2020 Than Ngo - 3.6ga8-5 +- fixed FTBFS against gcc10 + * Fri Jan 31 2020 Fedora Release Engineering - 3.6ga8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild