From 4d24f52ead1389d6694469632d304c8a0d1dc178 Mon Sep 17 00:00:00 2001
From: Moazin Khatti <moazinkhatri@gmail.com>
Date: Fri, 23 Aug 2019 15:00:50 +0500
Subject: [PATCH] [sfnt,svg] Fix includes to allow a `multi' build.

---
 src/sfnt/rules.mk | 1 +
 src/sfnt/ttsvg.c  | 3 +++
 src/sfnt/ttsvg.h  | 1 +
 src/svg/ftsvg.c   | 3 +++
 src/svg/ftsvg.h   | 1 +
 src/svg/rules.mk  | 1 +
 6 files changed, 10 insertions(+)

diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index ee3314eac..2699e0d9f 100644
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -36,6 +36,7 @@ SFNT_DRV_SRC := $(SFNT_DIR)/pngshim.c  \
                 $(SFNT_DIR)/ttcmap.c   \
                 $(SFNT_DIR)/ttcolr.c   \
                 $(SFNT_DIR)/ttcpal.c   \
+                $(SFNT_DIR)/ttsvg.c    \
                 $(SFNT_DIR)/ttkern.c   \
                 $(SFNT_DIR)/ttload.c   \
                 $(SFNT_DIR)/ttmtx.c    \
diff --git a/src/sfnt/ttsvg.c b/src/sfnt/ttsvg.c
index da83168b0..df311d682 100644
--- a/src/sfnt/ttsvg.c
+++ b/src/sfnt/ttsvg.c
@@ -27,6 +27,7 @@
 #include <ft2build.h>
 #include FT_INTERNAL_STREAM_H
 #include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_GZIP_H
 #include FT_OTSVG_H
@@ -47,6 +48,8 @@
     FT_ULong  table_size;
   } Svg;
 
+#undef  FT_COMPONENT
+#define FT_COMPONENT  ttsvg
 
   FT_LOCAL_DEF( FT_Error )
   tt_face_load_svg( TT_Face    face,
diff --git a/src/sfnt/ttsvg.h b/src/sfnt/ttsvg.h
index c54e04832..2226f7820 100644
--- a/src/sfnt/ttsvg.h
+++ b/src/sfnt/ttsvg.h
@@ -19,6 +19,7 @@
 #define __TTSVG_H__
 
 #include <ft2build.h>
+#include FT_INTERNAL_TRUETYPE_TYPES_H
 
 FT_BEGIN_HEADER
 
diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c
index 2193852fd..8cc5691fa 100644
--- a/src/svg/ftsvg.c
+++ b/src/svg/ftsvg.c
@@ -17,11 +17,14 @@
 
 #include <ft2build.h>
 #include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_SERVICE_H
 #include FT_SERVICE_PROPERTIES_H
 #include FT_OTSVG_H
 #include FT_INTERNAL_SVG_INTERFACE_H
 #include FT_BBOX_H
 
+#include "svgtypes.h"
+
 #ifdef FT_CONFIG_OPTION_DEFAULT_SVG
 #include <rsvg_port.h>
 #endif
diff --git a/src/svg/ftsvg.h b/src/svg/ftsvg.h
index 74cc76760..09b52d55f 100644
--- a/src/svg/ftsvg.h
+++ b/src/svg/ftsvg.h
@@ -20,6 +20,7 @@
 
 #include <ft2build.h>
 #include FT_RENDER_H
+#include FT_INTERNAL_OBJECTS_H
 
 FT_BEGIN_HEADER
 
diff --git a/src/svg/rules.mk b/src/svg/rules.mk
index 869d50087..5acad2dab 100644
--- a/src/svg/rules.mk
+++ b/src/svg/rules.mk
@@ -82,6 +82,7 @@ DRV_OBJS_M += $(SVG_DRV_OBJ_M)
 
 ifeq ($(COMPILE_SVG_PORT), yes)
 DRV_OBJS_S += $(SVG_PORT_OBJ_S)
+DRV_OBJS_M += $(SVG_PORT_OBJ_S)
 endif
 
 # EOF