gentoo resync : 10.12.2017

2 files changed, 38 insertions, 0 deletions

diff --git a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch
new file mode 100644
index 000000000000..30731b904f25
--- /dev/null
+++ b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch
@@ -0,0 +1,22 @@
+From 72572a68d306712c040ca741f0655b190326a509 Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Sat, 9 Sep 2017 08:03:57 +0800
+Subject: [PATCH] startnoui.c: Include header that defines FindOrMakeEncoding
+
+Failure to include this was causing an implicit pointer to int conversion
+which results in an invalid pointer address on 64-bit builds.
+
+Fixes #3145.
+
+diff --git a/fontforgeexe/startnoui.c b/fontforgeexe/startnoui.c
+index ab8388539..7a188b7a2 100644
+--- a/fontforgeexe/startnoui.c
++++ b/fontforgeexe/startnoui.c
+@@ -27,6 +27,7 @@
+ #include "fontforgevw.h"
+ #include "scripting.h"
+ #include "start.h"
++#include "encoding.h"
+ 
+ #ifndef _NO_LIBUNICODENAMES
+ #include <libunicodenames.h>	/* need to open a database when we start */
diff --git a/media-gfx/fontforge/files/20170731-tilepath.patch b/media-gfx/fontforge/files/20170731-tilepath.patch
new file mode 100644
index 000000000000..c14d81dc430c
--- /dev/null
+++ b/media-gfx/fontforge/files/20170731-tilepath.patch
@@ -0,0 +1,16 @@
+Fix implicit declarations
+
+Fixed upstream in a larger refactor.
+
+--- a/fontforgeexe/tilepath.c
++++ b/fontforgeexe/tilepath.c
+@@ -24,7 +24,9 @@
+  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
++#include "cvundoes.h"
+ #include "fontforgeui.h"
++#include "fvfonts.h"
+ #include "splineutil.h"
+ #include "splineutil2.h"
+ #include <math.h>