summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2020-05-13 19:53:32 -0400
committerMike Gilbert <floppym@gentoo.org>2020-05-13 19:53:32 -0400
commit4318cd69b4e540d455464cf0681431b1c5c7cf47 (patch)
treee14211a61da792695ca00e6b3b5f468a4489ed44
parentmedia-gfx/fontforge: depend on >=dev-python/sphinx-2 (diff)
downloadgentoo-4318cd69b4e540d455464cf0681431b1c5c7cf47.tar.gz
gentoo-4318cd69b4e540d455464cf0681431b1c5c7cf47.tar.bz2
gentoo-4318cd69b4e540d455464cf0681431b1c5c7cf47.zip
media-gfx/fontforge: fix build on musl
Closes: https://bugs.gentoo.org/706792 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch38
-rw-r--r--media-gfx/fontforge/fontforge-20200314.ebuild1
2 files changed, 39 insertions, 0 deletions
diff --git a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
new file mode 100644
index 00000000000..d6beff7984c
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
@@ -0,0 +1,38 @@
+From 5a3d2ce60aeefd706c36a8325721b0c8c818c742 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 1 May 2020 05:06:07 -0400
+Subject: [PATCH] Stub-out MacServiceReadFDs() on non-Mac platforms (#4246)
+
+This should fix a build failure on Linux with musl libc due to the
+missing sys/select.h include.
+
+MacServiceReadFDs seems to only be called in startui.c, also behind the
+__Mac macro.
+
+Bug: https://bugs.gentoo.org/706792
+---
+ gdraw/gdraw.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c
+index 1fb3354b1d..6bac57b92a 100644
+--- a/gdraw/gdraw.c
++++ b/gdraw/gdraw.c
+@@ -32,7 +32,7 @@
+ #include "gkeysym.h"
+ #include "ustring.h"
+
+-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
++#if __Mac
+ # include <sys/select.h>
+ #endif
+
+@@ -1076,7 +1076,7 @@ GDrawRemoveReadFD( GDisplay *gdisp,
+
+ void MacServiceReadFDs()
+ {
+-#if (!defined(__MINGW32__))&&(!defined(__CYGWIN__))
++#if __Mac
+ int ret = 0;
+
+ GDisplay *gdisp = GDrawGetDisplayOfWindow(0);
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
index a6b9c7400db..3379e2f1b63 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/20200314-tilepath.patch
"${FILESDIR}"/20200314-big-endian.patch
"${FILESDIR}"/fontforge-doc-no-warn-error.patch
+ "${FILESDIR}"/20200314-MacServiceReadFDs.patch
)
pkg_setup() {