1 |
commit: 4318cd69b4e540d455464cf0681431b1c5c7cf47 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 13 23:53:32 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 13 23:53:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4318cd69 |
7 |
|
8 |
media-gfx/fontforge: fix build on musl |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706792 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
.../files/20200314-MacServiceReadFDs.patch | 38 ++++++++++++++++++++++ |
14 |
media-gfx/fontforge/fontforge-20200314.ebuild | 1 + |
15 |
2 files changed, 39 insertions(+) |
16 |
|
17 |
diff --git a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..d6beff7984c |
20 |
--- /dev/null |
21 |
+++ b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch |
22 |
@@ -0,0 +1,38 @@ |
23 |
+From 5a3d2ce60aeefd706c36a8325721b0c8c818c742 Mon Sep 17 00:00:00 2001 |
24 |
+From: Mike Gilbert <floppym@g.o> |
25 |
+Date: Fri, 1 May 2020 05:06:07 -0400 |
26 |
+Subject: [PATCH] Stub-out MacServiceReadFDs() on non-Mac platforms (#4246) |
27 |
+ |
28 |
+This should fix a build failure on Linux with musl libc due to the |
29 |
+missing sys/select.h include. |
30 |
+ |
31 |
+MacServiceReadFDs seems to only be called in startui.c, also behind the |
32 |
+__Mac macro. |
33 |
+ |
34 |
+Bug: https://bugs.gentoo.org/706792 |
35 |
+--- |
36 |
+ gdraw/gdraw.c | 4 ++-- |
37 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
38 |
+ |
39 |
+diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c |
40 |
+index 1fb3354b1d..6bac57b92a 100644 |
41 |
+--- a/gdraw/gdraw.c |
42 |
++++ b/gdraw/gdraw.c |
43 |
+@@ -32,7 +32,7 @@ |
44 |
+ #include "gkeysym.h" |
45 |
+ #include "ustring.h" |
46 |
+ |
47 |
+-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ |
48 |
++#if __Mac |
49 |
+ # include <sys/select.h> |
50 |
+ #endif |
51 |
+ |
52 |
+@@ -1076,7 +1076,7 @@ GDrawRemoveReadFD( GDisplay *gdisp, |
53 |
+ |
54 |
+ void MacServiceReadFDs() |
55 |
+ { |
56 |
+-#if (!defined(__MINGW32__))&&(!defined(__CYGWIN__)) |
57 |
++#if __Mac |
58 |
+ int ret = 0; |
59 |
+ |
60 |
+ GDisplay *gdisp = GDrawGetDisplayOfWindow(0); |
61 |
|
62 |
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild |
63 |
index a6b9c7400db..3379e2f1b63 100644 |
64 |
--- a/media-gfx/fontforge/fontforge-20200314.ebuild |
65 |
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild |
66 |
@@ -57,6 +57,7 @@ PATCHES=( |
67 |
"${FILESDIR}"/20200314-tilepath.patch |
68 |
"${FILESDIR}"/20200314-big-endian.patch |
69 |
"${FILESDIR}"/fontforge-doc-no-warn-error.patch |
70 |
+ "${FILESDIR}"/20200314-MacServiceReadFDs.patch |
71 |
) |
72 |
|
73 |
pkg_setup() { |