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

fontforge_2019, use correct patchset (#8238)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-04-02 16:03:57 +02:00
committed by GitHub
parent 077db7ee1b
commit 97bb03bc57
2 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
media-gfx/fontforge/patches/fontforge-20190501~git.patchset Normal file
View File

@@ -0,0 +1,45 @@
From 36e43aaf6451c49c20c9d70c1323d1d5a3fc232e Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 1 Apr 2023 11:47:25 +0200
Subject: fontforge, revert patch for locale_t
diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
index 8f54ef4..643e3dd 100644
--- a/fontforge/splinefont.h
+++ b/fontforge/splinefont.h
@@ -2622,7 +2622,7 @@ extern void debug_printHint( StemInfo *h, char* msg );
#include "ustring.h"
-#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
From 1c8bd45ff63dff8a9ac5a1f578da4a097adce43d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 1 Apr 2023 12:31:07 +0200
Subject: Don't use -Werror=int-conversion on 32bit
diff --git a/configure.ac b/configure.ac
index 1ed4685..d124e94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,7 +548,7 @@ AM_CONDITIONAL([FONTTOOLS],[test x"${fontforge_extras}" = xyes])
# Create and Set FontForge Compiler Flags
my_cflags="${my_cflags} ${WARNING_CFLAGS}"
-my_cflags="${my_cflags} -Werror=implicit-function-declaration -Werror=int-conversion"
+my_cflags="${my_cflags} -Werror=implicit-function-declaration"
if test x"${i_do_have_freetype_debugger}" != xno; then
my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/src/truetype"
my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include"
--
2.37.3

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

@@ -1,22 +0,0 @@
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