| 1 |
commit: bd448c785d27156d8edda57b9be0770cb9e6c870 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 29 20:42:02 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 29 20:42:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd448c78 |
| 7 |
|
| 8 |
media-gfx/fontforge: replace memory alignment patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/fontforge/files/20200314-stylemap.patch | 30 +++++++++++++++++++++++ |
| 14 |
media-gfx/fontforge/fontforge-20200314.ebuild | 2 +- |
| 15 |
2 files changed, 31 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/fontforge/files/20200314-stylemap.patch b/media-gfx/fontforge/files/20200314-stylemap.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..d3311cab02d |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/fontforge/files/20200314-stylemap.patch |
| 22 |
@@ -0,0 +1,30 @@ |
| 23 |
+From 3b83adc89771000eb95fcd87bb675f771ba85aaf Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Mike Gilbert <floppym@g.o> |
| 25 |
+Date: Sun, 29 Mar 2020 16:36:14 -0400 |
| 26 |
+Subject: [PATCH] Avoid integer size conflict when setting stylemap |
| 27 |
+ |
| 28 |
+stylemap is a 16-bit integer, but hexmap writes 32-bits. |
| 29 |
+ |
| 30 |
+Bug: https://bugs.gentoo.org/642756 |
| 31 |
+--- |
| 32 |
+ fontforge/sfd.c | 4 +++- |
| 33 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
| 34 |
+ |
| 35 |
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c |
| 36 |
+index 9517d8cb1..b638fe447 100644 |
| 37 |
+--- a/fontforge/sfd.c |
| 38 |
++++ b/fontforge/sfd.c |
| 39 |
+@@ -8104,7 +8104,9 @@ bool SFD_GetFontMetaData( FILE *sfd, |
| 40 |
+ } |
| 41 |
+ else if ( strmatch(tok,"StyleMap:")==0 ) |
| 42 |
+ { |
| 43 |
+- gethex(sfd,(uint32 *)&sf->pfminfo.stylemap); |
| 44 |
++ uint32 u; |
| 45 |
++ gethex(sfd,&u); |
| 46 |
++ sf->pfminfo.stylemap = u; |
| 47 |
+ } |
| 48 |
+ /* Legacy attribute for StyleMap. Deprecated. */ |
| 49 |
+ else if ( strmatch(tok,"OS2StyleName:")==0 ) |
| 50 |
+-- |
| 51 |
+2.26.0.rc2 |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild |
| 55 |
index 6ff768243ee..adb0670b3bb 100644 |
| 56 |
--- a/media-gfx/fontforge/fontforge-20200314.ebuild |
| 57 |
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild |
| 58 |
@@ -56,7 +56,7 @@ BDEPEND=" |
| 59 |
" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
- "${FILESDIR}"/20170731-gethex-unaligned.patch |
| 63 |
+ "${FILESDIR}"/20200314-stylemap.patch |
| 64 |
"${FILESDIR}"/20200314-tilepath.patch |
| 65 |
) |
Archives