[gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/files/, media-gfx/fontforge/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     8faf66e996ac4780611a3ddfd794dd5417f1a6c6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 02:22:47 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 02:22:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8faf66e9

media-gfx/fontforge: Fix undefined reference

Bug: https://bugs.gentoo.org/572456

Package-Manager: portage-2.2.28_p60

 .../fontforge/files/fontforge-dummy-spiro.patch    | 25 ++++++++++++++++++++++
 media-gfx/fontforge/fontforge-20150824.ebuild      |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/media-gfx/fontforge/files/fontforge-dummy-spiro.patch b/media-gfx/fontforge/files/fontforge-dummy-spiro.patch
new file mode 100644
index 0000000..d2e73d5
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-dummy-spiro.patch
@@ -0,0 +1,25 @@
+From 63def02823e631cd73b763541a87d7c480be799e Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Mon, 14 Mar 2016 12:25:45 +0800
+Subject: [PATCH] Spiros: Add dummy _SpiroCP2SplineSet when compiling without
+ Spiros.
+
+---
+ fontforge/spiro.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/fontforge/spiro.c b/fontforge/spiro.c
+index 629339a..bb2f36f 100644
+--- a/fontforge/spiro.c
++++ b/fontforge/spiro.c
+@@ -35,6 +35,10 @@
+ 
+ static int has_spiro = false;
+ 
++static SplineSet *_SpiroCP2SplineSet(spiro_cp *spiros) {
++	return NULL;
++}
++
+ SplineSet *SpiroCP2SplineSet(spiro_cp *spiros) {
+     return( NULL );
+ }

diff --git a/media-gfx/fontforge/fontforge-20150824.ebuild b/media-gfx/fontforge/fontforge-20150824.ebuild
index 629ebc3..dadd184 100644
--- a/media-gfx/fontforge/fontforge-20150824.ebuild
+++ b/media-gfx/fontforge/fontforge-20150824.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,6 +63,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/fontforge-dummy-spiro.patch
 	epatch_user
 }