From 934ec4aeeba63f07817751f2b94f5a2465daa84d Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Mon, 21 Feb 2022 02:41:03 -0600 Subject: [PATCH] academic/chemtool: Fix build failure with gcc10. --- academic/chemtool/chemtool.SlackBuild | 4 +++ academic/chemtool/gcc10.patch | 37 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 academic/chemtool/gcc10.patch diff --git a/academic/chemtool/chemtool.SlackBuild b/academic/chemtool/chemtool.SlackBuild index a05d93d3f9..975235e59a 100644 --- a/academic/chemtool/chemtool.SlackBuild +++ b/academic/chemtool/chemtool.SlackBuild @@ -79,6 +79,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks, Debian +# https://salsa.debian.org/debichem-team/chemtool/-/blob/7d0413fe4f5bce35fe9c16fd196758319df05442/debian/patches/957084_gcc10.patch +patch -p1 < $CWD/gcc10.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/academic/chemtool/gcc10.patch b/academic/chemtool/gcc10.patch new file mode 100644 index 0000000000..d782f8e4a6 --- /dev/null +++ b/academic/chemtool/gcc10.patch @@ -0,0 +1,37 @@ +--- a/ct1.h ++++ b/ct1.h +@@ -273,12 +273,12 @@ + extern float importfactor; + extern int importoffset; + +-char **intype; +-char **inmode; +-int babelin; +-char **outtype; +-char **outmode; +-int babelout; ++extern char **intype; ++extern char **inmode; ++extern int babelin; ++extern char **outtype; ++extern char **outmode; ++extern int babelout; + extern char *babel; + extern GdkGC *mygc[8],*background_gc,*hlgc; + extern int curpen; +--- a/inout.c ++++ b/inout.c +@@ -30,6 +30,13 @@ + extern GdkFont *font[7],*smallfont[7],*symbfont[7],*boldfont[7],*slfont[7]; + #endif + ++char **intype; ++char **inmode; ++int babelin; ++char **outtype; ++char **outmode; ++int babelout; ++ + static char babeloutp[4]; + + int