diff -Nurd freetype-2.12.1.orig/builds/unix/install.mk freetype-2.12.1/builds/unix/install.mk --- freetype-2.12.1.orig/builds/unix/install.mk 2022-01-27 02:43:19.000000000 -0500 +++ freetype-2.12.1/builds/unix/install.mk 2023-01-15 23:48:56.000000000 -0500 @@ -24,18 +24,10 @@ # Unix installation and deinstallation targets. # -# Note that we remove any data found in `$(includedir)/freetype2' before -# installing new files to avoid interferences with files installed by -# previous FreeType versions (which use slightly different locations). -# -# We also remove `$(includedir)/ft2build.h' for the same reason. -# # Note that some header files get handled twice for simplicity; a special, # configured version overwrites the generic one. # install: $(PROJECT_LIBRARY) - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 - -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ $(DESTDIR)$(libdir)/pkgconfig \ $(DESTDIR)$(includedir)/freetype2/freetype/config \ @@ -46,11 +38,11 @@ endif $(LIBTOOL) --mode=install $(INSTALL) \ $(PROJECT_LIBRARY) $(DESTDIR)$(libdir) - -for P in $(PUBLIC_H) ; do \ + for P in $(PUBLIC_H) ; do \ $(INSTALL_DATA) \ $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \ done - -for P in $(CONFIG_H) ; do \ + for P in $(CONFIG_H) ; do \ $(INSTALL_DATA) \ $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \ done diff -Nurd freetype-2.12.1.orig/include/freetype/t1tables.h freetype-2.12.1/include/freetype/t1tables.h --- freetype-2.12.1.orig/include/freetype/t1tables.h 2022-03-13 11:58:57.000000000 -0400 +++ freetype-2.12.1/include/freetype/t1tables.h 2023-01-15 23:48:56.000000000 -0500 @@ -97,6 +97,15 @@ FT_Short underline_position; FT_UShort underline_thickness; + /* + 2.3.8 transiently had added: + FT_UShort fs_type; + then removed it again in 2.3.9. Field was private(?) but size of + struct was public, so this was backard-incompatible ABI break. + Fink didn't notice and pushed 2.3.8 widely. So now we add a + dummy member to remain at 2.3.8 size and avoid further breakage. + */ + FT_UShort fink_ABI_shim; } PS_FontInfoRec;