commit: bd448c785d27156d8edda57b9be0770cb9e6c870 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Mar 29 20:42:02 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Mar 29 20:42:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd448c78
media-gfx/fontforge: replace memory alignment patch Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> media-gfx/fontforge/files/20200314-stylemap.patch | 30 +++++++++++++++++++++++ media-gfx/fontforge/fontforge-20200314.ebuild | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/media-gfx/fontforge/files/20200314-stylemap.patch b/media-gfx/fontforge/files/20200314-stylemap.patch new file mode 100644 index 00000000000..d3311cab02d --- /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 <[email protected]> +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/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild index 6ff768243ee..adb0670b3bb 100644 --- a/media-gfx/fontforge/fontforge-20200314.ebuild +++ b/media-gfx/fontforge/fontforge-20200314.ebuild @@ -56,7 +56,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/20170731-gethex-unaligned.patch + "${FILESDIR}"/20200314-stylemap.patch "${FILESDIR}"/20200314-tilepath.patch )
