haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fontforge 2019, fix build (#8237)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-04-02 15:54:08 +02:00
committed by GitHub
parent 1a2841a21c
commit 077db7ee1b
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-gfx/fontforge/fontforge-20190501~git.recipe
View File

@@ -13,8 +13,9 @@ SOURCE_URI="https://github.com/fontforge/fontforge/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="bf99ec3da1f1467d96a48562367a8c472cd3ec6a2685f537d952da63aa304120"
SOURCE_FILENAME="fontforge-$portVersion.tar.gz"
SOURCE_DIR="fontforge-$srcGitRev"
PATCHES="fontforge-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2 !x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -51,7 +52,7 @@ REQUIRES="
lib:libncurses$secondaryArchSuffix
# lib:libpangocairo_1.0$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libpython3.7m$secondaryArchSuffix
lib:libpython3.9$secondaryArchSuffix
lib:libreadline$secondaryArchSuffix
lib:libspiro$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
@@ -86,7 +87,7 @@ BUILD_REQUIRES="
devel:libncurses$secondaryArchSuffix
# devel:libpangocairo_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpython3.7m$secondaryArchSuffix
devel:libpython3.9$secondaryArchSuffix
devel:libreadline$secondaryArchSuffix
devel:libspiro$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
@@ -104,7 +105,7 @@ BUILD_PREREQUIRES="
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python3.7
cmd:python3
"
BUILD()

22
media-gfx/fontforge/patches/fontforge-20230101.patchset Normal file
View File

@@ -0,0 +1,22 @@
From 23d3846a5271c55cb77853f8eed32ffdb4519eb8 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 1 Apr 2023 17:49:54 +0200
Subject: Revert patch for locale_t
diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
index cd6f554..509d813 100644
--- a/fontforge/splinefont.h
+++ b/fontforge/splinefont.h
@@ -2630,7 +2630,7 @@ extern bool isSplinePointPartOfGuide( SplineFont *sf, SplinePoint *sp );
extern void debug_printHint( StemInfo *h, char* msg );
-#if defined(_WIN32) || defined(__HAIKU__)
+#if defined(_WIN32)
#define BAD_LOCALE_HACK
typedef char* locale_t;
#define LC_GLOBAL_LOCALE ((locale_t)-1)
--
2.37.3