| 1 |
commit: 3f532db1541c8f454b1ecdfabf534785d7c6d91f |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 9 16:56:46 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 9 16:57:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f532db1 |
| 7 |
|
| 8 |
media-gfx/fontforge: fix segfault with X disabled |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/638342 |
| 11 |
Package-Manager: Portage-2.3.15, Repoman-2.3.6_p7 |
| 12 |
|
| 13 |
media-gfx/fontforge/Manifest | 4 ++-- |
| 14 |
.../20170731-startnoui-FindOrMakeEncoding.patch | 22 ++++++++++++++++++++++ |
| 15 |
...0170731.ebuild => fontforge-20170731-r1.ebuild} | 4 ++++ |
| 16 |
3 files changed, 28 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest |
| 19 |
index 49db4bd8048..67c9be75d68 100644 |
| 20 |
--- a/media-gfx/fontforge/Manifest |
| 21 |
+++ b/media-gfx/fontforge/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
-DIST fontforge-dist-20160404.tar.gz 20906256 SHA256 6c73a556030d985e166974e5d6025255290874c2d6bb349c9930b03f17b45bcd SHA512 be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363 WHIRLPOOL 2313c7775da7f7a47ef8bae3cbef897e8b0996c8f74db099562e0a3636984e8a9a55ca5f2ca11b205a7b1aff76e7fe4e7601f15b7951147353403da0e41d692f |
| 24 |
-DIST fontforge-dist-20170731.tar.xz 13985256 SHA256 840adefbedd1717e6b70b33ad1e7f2b116678fa6a3d52d45316793b9fd808822 SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 WHIRLPOOL 6d6e2b6322043bcd8822fb1e64a98b969ff1bba02d63442cf0646b737576ead76961a30cf146447afa0f72a2e9a30a05e6dad5f9060a00cd35e5cc2e15097889 |
| 25 |
+DIST fontforge-dist-20160404.tar.gz 20906256 BLAKE2B 11f9a54de2cada7e243349ec0ddeb3f2025f12a9e9323b2bea437009ccd5e34d27ba41752752434c16b1a0b809c9878c23cd074bb59b590b427c599d575f0c45 SHA512 be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363 |
| 26 |
+DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 |
| 27 |
|
| 28 |
diff --git a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..30731b904f2 |
| 31 |
--- /dev/null |
| 32 |
+++ b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch |
| 33 |
@@ -0,0 +1,22 @@ |
| 34 |
+From 72572a68d306712c040ca741f0655b190326a509 Mon Sep 17 00:00:00 2001 |
| 35 |
+From: Jeremy Tan <jtanx@×××××××.com> |
| 36 |
+Date: Sat, 9 Sep 2017 08:03:57 +0800 |
| 37 |
+Subject: [PATCH] startnoui.c: Include header that defines FindOrMakeEncoding |
| 38 |
+ |
| 39 |
+Failure to include this was causing an implicit pointer to int conversion |
| 40 |
+which results in an invalid pointer address on 64-bit builds. |
| 41 |
+ |
| 42 |
+Fixes #3145. |
| 43 |
+ |
| 44 |
+diff --git a/fontforgeexe/startnoui.c b/fontforgeexe/startnoui.c |
| 45 |
+index ab8388539..7a188b7a2 100644 |
| 46 |
+--- a/fontforgeexe/startnoui.c |
| 47 |
++++ b/fontforgeexe/startnoui.c |
| 48 |
+@@ -27,6 +27,7 @@ |
| 49 |
+ #include "fontforgevw.h" |
| 50 |
+ #include "scripting.h" |
| 51 |
+ #include "start.h" |
| 52 |
++#include "encoding.h" |
| 53 |
+ |
| 54 |
+ #ifndef _NO_LIBUNICODENAMES |
| 55 |
+ #include <libunicodenames.h> /* need to open a database when we start */ |
| 56 |
|
| 57 |
diff --git a/media-gfx/fontforge/fontforge-20170731.ebuild b/media-gfx/fontforge/fontforge-20170731-r1.ebuild |
| 58 |
similarity index 97% |
| 59 |
rename from media-gfx/fontforge/fontforge-20170731.ebuild |
| 60 |
rename to media-gfx/fontforge/fontforge-20170731-r1.ebuild |
| 61 |
index ae257f14831..7f92af08a57 100644 |
| 62 |
--- a/media-gfx/fontforge/fontforge-20170731.ebuild |
| 63 |
+++ b/media-gfx/fontforge/fontforge-20170731-r1.ebuild |
| 64 |
@@ -62,6 +62,10 @@ DEPEND="${RDEPEND} |
| 65 |
|
| 66 |
S="${WORKDIR}/fontforge-2.0.${PV}" |
| 67 |
|
| 68 |
+PATCHES=( |
| 69 |
+ "${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch |
| 70 |
+) |
| 71 |
+ |
| 72 |
pkg_setup() { |
| 73 |
use python && python-single-r1_pkg_setup |
| 74 |
} |
Archives