From b579fd27442a0a5172e39d73c3efb93d8021892d Mon Sep 17 00:00:00 2001
From: Jean Guyomarc'h <jean@guyomarch.bzh>
Date: Tue, 19 Dec 2017 14:11:44 +0100
Subject: [PATCH] evas/elm: fix visibility of some symbols

Public symbols were defined internal to Evas/Elementary on macOS, making
the link of external modules unfeasible.

- EAPI was messed up by an invalid inclusion of evas_text_utils.h, making
  some symbols private instead of public.
- A similar issue was present in evas_font_draw.c, where the symbols
  were directly imported without the proper definition of EAPI.
- Elementary.h did include some eo-generated headers, but for windows
  only. It should not been restricted to windows, as it allows to export
  symbols to external modules.

Fixes T6448.
---
 src/lib/elementary/Elementary.h      | 5 -----
 src/lib/evas/common/evas_font.h      | 3 +++
 src/lib/evas/common/evas_font_draw.c | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index aef3abe..29b9886 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -221,9 +221,6 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_glview.h>
 #include <elm_grid.h>
 
-
-#ifdef _WIN32
-#ifdef ELEMENTARY_BUILD
 // Elm legacy headers that require EAPI defined
 #include <elm_spinner.eo.h>
 #include <elm_entry.eo.h>
@@ -236,8 +233,6 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_systray.eo.h>
 #include <elm_notify.eo.h>
 #include <elm_hoversel.eo.h>
-#endif
-#endif
 
 #include <elm_hover.h>
 #include <elm_image.h>
diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h
index 80c6537..9b0fb88 100644
--- a/src/lib/evas/common/evas_font.h
+++ b/src/lib/evas/common/evas_font.h
@@ -21,6 +21,8 @@ typedef unsigned long long    DATA64;
 #include <Eina.h>
 #include "evas_text_utils.h"
 
+#include "evas_text_utils.h"
+
 #ifdef EAPI
 # undef EAPI
 #endif
@@ -56,6 +58,7 @@ typedef unsigned long long    DATA64;
 #define LKDBG(x) eina_lock_debug(&(x))
 
 
+
 enum _Evas_Font_Style
 {
    EVAS_FONT_STYLE_SLANT,
diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index f40e9b5..9e42c9f 100644
--- a/src/lib/evas/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -1,4 +1,4 @@
-#include "evas_font_draw.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_blend_private.h"
 
-- 
2.7.4