diff --git a/xforms-1.2.4-gcc10.patch b/xforms-1.2.4-gcc10.patch new file mode 100644 index 0000000..3822ae4 --- /dev/null +++ b/xforms-1.2.4-gcc10.patch @@ -0,0 +1,24 @@ +Declare curobj for GCC 10 as static (RHBZ#1800271, thanks to Jens Thoms Toerring) + +--- xforms-1.2.4/fdesign/sp_spinner.c 2013-12-14 14:26:25.000000000 +0100 ++++ xforms-1.2.4/fdesign/sp_spinner.c.gcc10 2020-02-10 21:36:31.032128122 +0100 +@@ -29,7 +29,7 @@ + #include "spec/spinner_spec.h" + + static FD_spinnerattrib * spn_attrib; +-FL_OBJECT *curobj; ++static FL_OBJECT *curobj; + + + /*************************************** +--- xforms-1.2.4/fdesign/sp_twheel.c 2014-06-28 22:34:29.000000000 +0200 ++++ xforms-1.2.4/fdesign/sp_twheel.c.gcc10 2020-02-10 21:36:07.910351664 +0100 +@@ -38,7 +38,7 @@ + #include "spec/twheel_spec.h" + + static FD_twheelattrib * twheel_attrib; +-FL_OBJECT * curobj; ++static FL_OBJECT * curobj; + + + /*************************************** diff --git a/xforms.spec b/xforms.spec index 08bb513..3b77e65 100644 --- a/xforms.spec +++ b/xforms.spec @@ -6,12 +6,13 @@ Name: xforms Summary: XForms toolkit library Version: 1.2.4 -Release: 15%{?dist} +Release: 16%{?dist} License: LGPLv2+ URL: http://xforms-toolkit.org/ Source0: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz Source1: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig +Patch0: xforms-1.2.4-gcc10.patch BuildRequires: gcc BuildRequires: libjpeg-devel @@ -64,6 +65,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?pre} +%patch0 -p1 -b .gcc10 # rpath hack sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure @@ -133,6 +135,9 @@ fi %changelog +* Mon Feb 10 2020 Robert Scheck - 1.2.4-16 +- Declare curobj as static (#1800271, thanks to Jens Thoms Toerring) + * Fri Jan 31 2020 Fedora Release Engineering - 1.2.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild