diff options
| -rw-r--r-- | libraries/xforms/xforms-1.2.4-fno-common.patch | 40 | ||||
| -rw-r--r-- | libraries/xforms/xforms.SlackBuild | 5 |
2 files changed, 43 insertions, 2 deletions
diff --git a/libraries/xforms/xforms-1.2.4-fno-common.patch b/libraries/xforms/xforms-1.2.4-fno-common.patch new file mode 100644 index 0000000000..fd4ca7714f --- /dev/null +++ b/libraries/xforms/xforms-1.2.4-fno-common.patch @@ -0,0 +1,40 @@ +Description: Fix FTBFS with GCC 10 +Author: Paul Wise <pabs@debian.org> +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/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; + + + /*************************************** +--- a/lib/objects.c ++++ b/lib/objects.c +@@ -36,6 +36,9 @@ + + #define TRANSLATE_Y( obj, form ) ( form->h - obj->h - obj->y ) + ++extern FL_OBJECT * fli_handled_obj; /* defined in events.c */ ++extern FL_OBJECT * fli_handled_parent; /* defined in events.c */ ++ + extern FL_FORM * fli_fast_free_object; /* defined in forms.c */ + + extern FL_OBJECT * fli_handled_obj; /* defined in events.c */ diff --git a/libraries/xforms/xforms.SlackBuild b/libraries/xforms/xforms.SlackBuild index 989a8aff16..49b291f8d3 100644 --- a/libraries/xforms/xforms.SlackBuild +++ b/libraries/xforms/xforms.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2009-2014 LukenShiro, Italy # All rights reserved. -# Copyright 2019 Christoph Willing, Brisbane Australia +# Copyright 2019-2021 Christoph Willing, Brisbane/Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PRGNAM=xforms VERSION=${VERSION:-1.2.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +patch -p1 < $CWD/xforms-1.2.4-fno-common.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ |