And here's the patch to fix freetype2-demos compilation first. Le jeu. 4 juin 2020 à 02:42, David Turner <da...@freetype.org> a écrit :
> Since nobody does development on DOS or Windows 9x anymore, we can finally > drop the requirement to use file names limited to the 8.3 format, which was > the reason why the FT_LONG_HEADER_NAME_H macros were introduced in the > first place. > > This bundle contains patches to replace all #include FT_XXX_H statements > from the library into the corresponding #include <freetype/xxxxxx.h> > include. > > Note that: > > - This doesn't try to rename any file. > > - The macros are still defined by <freetype/config/ftheader.h> to avoid > breaking existing client codes. We will likely have to live with them for a > _very_ long time, but that's life. > > - A few configuration-related macros are kept (e.g. FT_CONFIG_CONFIG_H, > FT_MODULE_H) are kept intentionally. I'd like to get rid of FT_MODULE_H > entirely in the future by refactoring the way feature configuration is > performed, but that's for a very different time. > > - The public headers should not be renamed. On the other hand, anything > under include/freetype/internal/ might be renamed to clearer names in the > future. > > IMPORTANT: This currently breaks ftdiff.c in freetype2-demos because it > tries to include FT_INTERNAL_OBJECTS_H, this should be addressed by a > different patch. > > The bundle contains 88 commits. Each one renaming a single macro. I > recommend submitting the bundle squashed after verifying that everything > works, but I'll let you choose otherwise if you prefer :-) > > - David >
From d6e2e57d08ab4c7db628be2ea8a01bc3ffc27482 Mon Sep 17 00:00:00 2001 From: David Turner <david.turner....@gmail.com> Date: Thu, 4 Jun 2020 02:46:45 +0200 Subject: [build] Include internal headers by their real names. The FT_INTERNAL_XXX_H macros are going to disappear. --- mac/ftoldmac.c | 6 +++--- src/compos.c | 2 +- src/ftdiff.c | 4 ++-- src/ftdump.c | 6 +++--- src/ftgrid.c | 6 +++--- src/ftinspect/engine/engine.cpp | 4 ++-- src/ftvalid.c | 8 ++++---- src/ftview.c | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mac/ftoldmac.c b/mac/ftoldmac.c index 8b02f85..04a97c4 100644 --- a/mac/ftoldmac.c +++ b/mac/ftoldmac.c @@ -29,12 +29,12 @@ #include FT_TRUETYPE_IDS_H /* the following header shouldn't be used in normal programs */ -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> /* showing driver name */ #include FT_MODULE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdrv.h> /* FSSpec functions are deprecated since Mac OS X 10.4 */ #ifndef HAVE_FSSPEC diff --git a/src/compos.c b/src/compos.c index 1b76ae3..7d5d19c 100644 --- a/src/compos.c +++ b/src/compos.c @@ -17,7 +17,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_INTERNAL_GLYPH_LOADER_H +#include <freetype/internal/internal/ftgloadr.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/ftdiff.c b/src/ftdiff.c index c1c2e5e..0728714 100644 --- a/src/ftdiff.c +++ b/src/ftdiff.c @@ -24,8 +24,8 @@ /* showing driver name -- the two internal header files */ /* shouldn't be used in normal programs */ #include FT_MODULE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdrv.h> #include <stdarg.h> #include <stdio.h> diff --git a/src/ftdump.c b/src/ftdump.c index b6f2b27..c3e277e 100644 --- a/src/ftdump.c +++ b/src/ftdump.c @@ -17,12 +17,12 @@ #include FT_MULTIPLE_MASTERS_H /* the following header shouldn't be used in normal programs */ -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> /* showing driver name */ #include FT_MODULE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdrv.h> /* error messages */ #undef FTERRORS_H_ diff --git a/src/ftgrid.c b/src/ftgrid.c index 29df45f..8a73bf2 100644 --- a/src/ftgrid.c +++ b/src/ftgrid.c @@ -20,12 +20,12 @@ #include <stdlib.h> /* the following header shouldn't be used in normal programs */ -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> /* showing driver name */ #include FT_MODULE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdrv.h> #include FT_STROKER_H #include FT_SYNTHESIS_H diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp index b770846..d8bb903 100644 --- a/src/ftinspect/engine/engine.cpp +++ b/src/ftinspect/engine/engine.cpp @@ -13,8 +13,8 @@ #include FT_LCD_FILTER_H // internal FreeType header files; only available in the source code bundle -#include FT_INTERNAL_DRIVER_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdrv.h> +#include <freetype/internal/ftobjs.h> ///////////////////////////////////////////////////////////////////////////// diff --git a/src/ftvalid.c b/src/ftvalid.c index b4474ff..c8bae7d 100644 --- a/src/ftvalid.c +++ b/src/ftvalid.c @@ -26,10 +26,10 @@ #include FT_GX_VALIDATE_H /* the following four header files shouldn't be used in normal programs */ -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_VALIDATE_H -#include FT_INTERNAL_MEMORY_H -#include FT_INTERNAL_OBJECTS_H +#include <freetype/internal/ftdebug.h> +#include <freetype/internal/ftvalid.h> +#include <freetype/internal/ftmemory.h> +#include <freetype/internal/ftobjs.h> #include "common.h" #include "mlgetopt.h" diff --git a/src/ftview.c b/src/ftview.c index 3fc4b3e..91ae2ac 100644 --- a/src/ftview.c +++ b/src/ftview.c @@ -22,12 +22,12 @@ #include <stdio.h> /* the following header shouldn't be used in normal programs */ -#include FT_INTERNAL_DEBUG_H +#include <freetype/internal/ftdebug.h> /* showing driver name */ #include FT_MODULE_H -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DRIVER_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdrv.h> #include FT_STROKER_H #include FT_SYNTHESIS_H -- 2.20.1
