diff -Nru libforms-1.2.3/debian/changelog libforms-1.2.3/debian/changelog --- libforms-1.2.3/debian/changelog 2019-11-11 02:33:39.000000000 +0000 +++ libforms-1.2.3/debian/changelog 2020-10-16 03:26:00.000000000 +0000 @@ -1,3 +1,18 @@ +libforms (1.2.3-1.6) unstable; urgency=medium + + * Non-maintainer upload. + * Really fix FTBFS with GCC 10 (Closes: #957439) + Thanks to Adrian Bunk for the ping. + + -- Paul Wise Fri, 16 Oct 2020 11:26:00 +0800 + +libforms (1.2.3-1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 10 (Closes: #957439) + + -- Paul Wise Fri, 16 Oct 2020 10:46:16 +0800 + libforms (1.2.3-1.4) unstable; urgency=medium * Non-maintainer upload. diff -Nru libforms-1.2.3/debian/patches/fix-gcc-10-ftbfs.patch libforms-1.2.3/debian/patches/fix-gcc-10-ftbfs.patch --- libforms-1.2.3/debian/patches/fix-gcc-10-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ libforms-1.2.3/debian/patches/fix-gcc-10-ftbfs.patch 2020-10-16 03:18:26.000000000 +0000 @@ -0,0 +1,52 @@ +Description: Fix FTBFS with GCC 10 +Author: Paul Wise +Bug-Debian: https://bugs.debian.org/957439 +Origin: upstream, extracted from two separate commits: + https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=9806bce102d0c079c2c486b25ae6bdac3c98eecf + https://git.savannah.nongnu.org/cgit/xforms.git/commit/?id=2c1a9f151baf50887a517280645ec23379fb96f8 +--- a/lib/flinternal.h ++++ b/lib/flinternal.h +@@ -138,9 +138,6 @@ + + /* events.c or event related */ + +-FL_OBJECT * fli_handled_obj; +-FL_OBJECT * fli_handled_parent; +- + void fli_obj_queue_delete( void ); + + void fli_event_queue_delete( void ); +--- a/lib/objects.c ++++ b/lib/objects.c +@@ -39,6 +39,9 @@ + + extern FL_FORM * fli_fast_free_object; /* defined in forms.c */ + ++extern FL_OBJECT * fli_handled_obj; /* defined in events.c */ ++extern FL_OBJECT * fli_handled_parent; /* defined in events.c */ ++ + static void redraw( FL_FORM *, + int ); + static void lose_focus( FL_OBJECT * ); +--- a/fdesign/sp_spinner.c ++++ b/fdesign/sp_spinner.c +@@ -29,7 +29,7 @@ + #include "spec/spinner_spec.h" + + static FD_spinnerattrib * spn_attrib; +-FL_OBJECT *curobj; ++static FL_OBJECT *curobj; + + + /*************************************** +--- a/fdesign/sp_twheel.c ++++ b/fdesign/sp_twheel.c +@@ -38,7 +38,7 @@ + #include "spec/twheel_spec.h" + + static FD_twheelattrib * twheel_attrib; +-FL_OBJECT * curobj; ++static FL_OBJECT * curobj; + + + /*************************************** diff -Nru libforms-1.2.3/debian/patches/series libforms-1.2.3/debian/patches/series --- libforms-1.2.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libforms-1.2.3/debian/patches/series 2020-10-16 02:43:44.000000000 +0000 @@ -0,0 +1 @@ +fix-gcc-10-ftbfs.patch