Explicitly reference all additional files.

Not referencing them caused them to be missing from the source packages.

This also moves all files that were in different dirs under the common
additional-files dir.
This commit is contained in:
Michael Lotz
2015-12-20 18:24:53 +01:00
parent 947c7b0ce2
commit a43c394c4d
47 changed files with 80 additions and 60 deletions

View File

@@ -0,0 +1,63 @@
From 780be69568af23c771f25a916c74c29aee7e3723 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 28 Nov 2014 19:41:17 +0000
Subject: [PATCH] we don't have locale_t...
---
fontforge/splinefont.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
index 45548d2..ae3297e 100644
--- a/fontforge/splinefont.h
+++ b/fontforge/splinefont.h
@@ -3546,7 +3546,7 @@ char * delimit_null(const char * input, char delimiter);
#include "ustring.h"
-#ifdef __MINGW32__
+#if defined (__MINGW32__) || defined (__HAIKU__)
#define BAD_LOCALE_HACK
typedef char* locale_t;
#define LC_GLOBAL_LOCALE ((locale_t)-1)
--
1.8.3.4
From 780be69568af23c771f25a916c74c29aee7e3723 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 28 Nov 2014 19:41:17 +0000
Subject: [PATCH] we don't have locale_t...
---
fontforge/splinefont.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
index 45548d2..ae3297e 100644
--- a/fontforge/splinefont.h
+++ b/fontforge/splinefont.h
@@ -3546,7 +3546,7 @@ char * delimit_null(const char * input, char delimiter);
#include "ustring.h"
-#ifdef __MINGW32__
+#if defined (__MINGW32__) || defined (__HAIKU__)
#define BAD_LOCALE_HACK
typedef char* locale_t;
#define LC_GLOBAL_LOCALE ((locale_t)-1)
--
1.8.3.4
diff --git a/fontforge/cvundoes.c b/fontforge/cvundoes.c
index 42ad37b..b06fe0a 100644
--- a/fontforge/cvundoes.c
+++ b/fontforge/cvundoes.c
@@ -33,7 +33,7 @@
#include "inc/gfile.h"
#include "psfont.h"
-#if defined(__MINGW32__)||defined(__CYGWIN__)
+#if defined(__MINGW32__)||defined(__CYGWIN__)||defined(__HAIKU__)
// no backtrace on windows yet
#else
#include <execinfo.h>