gentoo Easter resync : 12.04.2020

3 files changed, 61 insertions, 39 deletions

diff --git a/media-gfx/fontforge/files/20190317-gdk_init.patch b/media-gfx/fontforge/files/20190317-gdk_init.patch
deleted file mode 100644
index 060e69577482..000000000000
--- a/media-gfx/fontforge/files/20190317-gdk_init.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4577ad7205c600c6c8e809e10d51eb2118cb66b5 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 24 Mar 2019 18:12:21 -0400
-Subject: [PATCH] Defer gdk_init() until after CheckIsScript()
-
-This allows fontforge to run without an X server available.
-
-Fixes: https://github.com/fontforge/fontforge/issues/3582
----
- fontforgeexe/startui.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
-index 1bb5fd8ca..ae15afbf2 100644
---- a/fontforgeexe/startui.c
-+++ b/fontforgeexe/startui.c
-@@ -900,9 +900,6 @@ int fontforge_main( int argc, char **argv ) {
- #if !(GLIB_CHECK_VERSION(2, 35, 0))
-     g_type_init();
- #endif
--#ifdef FONTFORGE_CAN_USE_GDK
--    gdk_init(&argc, &argv);
--#endif
- 
-     /* Must be done before we cache the current directory */
-     /* Change to HOME dir if specified on the commandline */
-@@ -1093,6 +1090,9 @@ int fontforge_main( int argc, char **argv ) {
-     CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */
- 					/* If there is no UI, there is always a script */
- 			                /*  and we will never return from the above */
-+#ifdef FONTFORGE_CAN_USE_GDK
-+    gdk_init(&argc, &argv);
-+#endif
-     if ( load_prefs==NULL ||
- 	    (strcasecmp(load_prefs,"Always")!=0 &&	/* Already loaded */
- 	     strcasecmp(load_prefs,"Never")!=0 ))
--- 
-2.21.0
-
diff --git a/media-gfx/fontforge/files/20200314-stylemap.patch b/media-gfx/fontforge/files/20200314-stylemap.patch
new file mode 100644
index 000000000000..d3311cab02d2
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-stylemap.patch
@@ -0,0 +1,30 @@
+From 3b83adc89771000eb95fcd87bb675f771ba85aaf Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 29 Mar 2020 16:36:14 -0400
+Subject: [PATCH] Avoid integer size conflict when setting stylemap
+
+stylemap is a 16-bit integer, but hexmap writes 32-bits.
+
+Bug: https://bugs.gentoo.org/642756
+---
+ fontforge/sfd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c
+index 9517d8cb1..b638fe447 100644
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -8104,7 +8104,9 @@ bool SFD_GetFontMetaData( FILE *sfd,
+     }
+     else if ( strmatch(tok,"StyleMap:")==0 )
+     {
+-    gethex(sfd,(uint32 *)&sf->pfminfo.stylemap);
++	uint32 u;
++	gethex(sfd,&u);
++	sf->pfminfo.stylemap = u;
+     }
+     /* Legacy attribute for StyleMap. Deprecated. */
+     else if ( strmatch(tok,"OS2StyleName:")==0 )
+-- 
+2.26.0.rc2
+
diff --git a/media-gfx/fontforge/files/20200314-tilepath.patch b/media-gfx/fontforge/files/20200314-tilepath.patch
new file mode 100644
index 000000000000..1e0d077532a4
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-tilepath.patch
@@ -0,0 +1,31 @@
+From 43e6087ec9bdbb23b8bb61c07efe6490fab23d73 Mon Sep 17 00:00:00 2001
+From: skef <6175836+skef@users.noreply.github.com>
+Date: Thu, 19 Mar 2020 17:16:20 -0700
+Subject: [PATCH] Tilepath fix (#4231)
+
+---
+ fontforgeexe/tilepath.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fontforgeexe/tilepath.c b/fontforgeexe/tilepath.c
+index b329b54098..2575058eb4 100644
+--- a/fontforgeexe/tilepath.c
++++ b/fontforgeexe/tilepath.c
+@@ -571,7 +571,7 @@ static void AdjustPoint(TD *td,Spline *spline,bigreal t, FitPoint *to) {
+ 	} else {
+ 	    bigreal s=(dy1*dx2/dy2-dx1);
+ 	    if ( s>-.00001 && s<.00001 ) {	/* essentially parallel */
+-		to->p.x = x1; to->y = y1;
++		to->p.x = x1; to->p.y = y1;
+ 	    } else {
+ 		bigreal t1 = (x1-x2- dx2/dy2*(y1-y2))/s;
+ 		to->p.x = x1 + dx1*t1;
+@@ -610,7 +610,7 @@ static SplinePoint *TDMakePoint(TD *td,Spline *old,real t) {
+ 
+     AdjustPoint(td,old,t,&fp);
+     new = chunkalloc(sizeof(SplinePoint));
+-    new->me.x = tp.p.x; new->me.y = tp.p.y;
++    new->me.x = fp.p.x; new->me.y = fp.p.y;
+     new->nextcp = new->me;
+     new->prevcp = new->me;
+     new->nonextcp = new->noprevcp = true;