Rename extended to extendeddbl to avoid FTBFS on Hurd
authorAnthony Fok <foka@debian.org>
Fri, 15 Jan 2021 15:55:46 +0000 (15:55 +0000)
committerAnthony Fok <foka@debian.org>
Fri, 15 Jan 2021 15:55:46 +0000 (15:55 +0000)
commit21fcc193669b19e93126288bd402bf70f856660c
tree6d5cb3af624df679914ef6ec371aba775b65d3ae
parentc972554617e8f41587ebe203046210d0622364cd
Rename extended to extendeddbl to avoid FTBFS on Hurd

Origin: vendor
Forwarded: no
Last-Update: 2021-01-15

gnumach-dev 1.8+git20201129 added to i386/include/mach/i386/fp_reg.h
(struct i386_xfp_save) a new "extended" field which happens to collide
with "extended" type in FontForge, leading to FTBFS on Hurd:

    FAILED: fontforge/CMakeFiles/fontforge.dir/asmfpst.c.o
    /usr/bin/cc -Dfontforge_EXPORTS -I../../fontforge -I../../inc -Iinc -isystem /usr/include/glib-2.0 -isystem /usr/lib/i386-gnu/glib-2.0/include -isystem /usr/include/freetype2 -isystem /usr/include/libxml2 -isystem /usr/include/readline -isystem /usr/include/python3.9 -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -Werror=implicit-function-declaration -Werror=int-conversion -fdiagnostics-color=always -std=gnu99 -MD -MT fontforge/CMakeFiles/fontforge.dir/asmfpst.c.o -MF fontforge/CMakeFiles/fontforge.dir/asmfpst.c.o.d -o fontforge/CMakeFiles/fontforge.dir/asmfpst.c.o -c ../../fontforge/asmfpst.c
    In file included from ../../fontforge/asmfpst.h:4,
                     from ../../fontforge/asmfpst.c:30:
    ../../fontforge/splinefont.h:63:18: error: two or more data types in declaration specifiers
       63 | #define extended double
          |                  ^~~~~~
    In file included from /usr/include/i386-gnu/bits/sigcontext.h:30,
                     from /usr/include/signal.h:291,
                     from /usr/include/glib-2.0/glib/gbacktrace.h:36,
                     from /usr/include/glib-2.0/glib.h:34,
                     from /usr/include/glib-2.0/gobject/gbinding.h:28,
                     from /usr/include/glib-2.0/glib-object.h:22,
                     from /usr/include/glib-2.0/gio/gioenums.h:28,
                     from /usr/include/glib-2.0/gio/giotypes.h:28,
                     from /usr/include/glib-2.0/gio/gio.h:26,
                     from ../../inc/ffglib.h:29,
                     from ../../fontforge/baseviews.h:31,
                     from ../../fontforge/fontforgevw.h:31,
                     from ../../fontforge/asmfpst.c:33:
    /usr/include/i386-gnu/mach/i386/fp_reg.h:80:24: error: expected identifier or ‘(’ before ‘[’ token
       80 |  unsigned char extended[0]; /* Extended region */
          |                        ^

This patch rename "extended" to "extendeddbl" to avoid the name collision.
Last-Update: 2021-01-15
Gbp-Pq: Name 0005-hurd-rename-extended-to-avoid-conflict-with-gnumach-dev.patch
26 files changed:
fontforge/autohint.c
fontforge/autowidth.c
fontforge/edgelist2.h
fontforge/effects.c
fontforge/fvcomposite.c
fontforge/glyphcomp.c
fontforge/scripting.c
fontforge/scstyles.c
fontforge/splinechar.c
fontforge/splinefill.c
fontforge/splinefit.c
fontforge/splinefont.c
fontforge/splinefont.h
fontforge/splineorder2.c
fontforge/splineoverlap.c
fontforge/splineoverlap.h
fontforge/splinestroke.c
fontforge/splineutil.c
fontforge/splineutil.h
fontforge/splineutil2.c
fontforge/stemdb.c
fontforge/utanvec.c
fontforgeexe/charview.c
fontforgeexe/cvknife.c
fontforgeexe/cvruler.c
fontforgeexe/problems.c