diff options
| author | taca <taca@pkgsrc.org> | 2016-09-27 10:24:56 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2016-09-27 10:24:56 +0000 |
| commit | b158ab95242e4a64596a6b0e8330d2919ac33d85 (patch) | |
| tree | b307fd318667dd9dc0119bd39a1333b3d11d46a8 /fonts | |
| parent | 1eccba52231eca742cd86c08247750217837993c (diff) | |
| download | pkgsrc-b158ab95242e4a64596a6b0e8330d2919ac33d85.tar.gz | |
Fix build problem on NetBSD 6.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/fontforge/distinfo | 4 | ||||
| -rw-r--r-- | fonts/fontforge/patches/patch-fontforge_splinefont.h | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo index e6ee1328e39..f4663be9ab0 100644 --- a/fonts/fontforge/distinfo +++ b/fonts/fontforge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2016/04/07 10:09:02 adam Exp $ +$NetBSD: distinfo,v 1.64 2016/09/27 10:24:56 taca Exp $ SHA1 (fontforge-dist-20160404.tar.gz) = e7c235f3d0ef59196df30707e18ad1198ff7baae RMD160 (fontforge-dist-20160404.tar.gz) = e72662db3a00a9da6a2639d36f8f0b9890cda936 @@ -6,5 +6,5 @@ SHA512 (fontforge-dist-20160404.tar.gz) = be94f04881b12ed3b1a34d0d7cc9149321db17 Size (fontforge-dist-20160404.tar.gz) = 20906256 bytes SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9 SHA1 (patch-configure) = d85d82bed7ee84c5b8282afd1310872eca39a3dd -SHA1 (patch-fontforge_splinefont.h) = b518e61e3ba88c7fb86ebe53fb62109447791121 +SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b diff --git a/fonts/fontforge/patches/patch-fontforge_splinefont.h b/fonts/fontforge/patches/patch-fontforge_splinefont.h index 7403a889897..2cfda8af457 100644 --- a/fonts/fontforge/patches/patch-fontforge_splinefont.h +++ b/fonts/fontforge/patches/patch-fontforge_splinefont.h @@ -1,15 +1,26 @@ -$NetBSD: patch-fontforge_splinefont.h,v 1.1 2016/02/07 14:09:08 adam Exp $ +$NetBSD: patch-fontforge_splinefont.h,v 1.2 2016/09/27 10:24:57 taca Exp $ -NetBSD does not implement uselocale(). +* NetBSD does not implement uselocale(). +* NetBSD prior to 7.0 dose not have locale_t. ---- fontforge/splinefont.h.orig 2016-02-07 13:01:04.000000000 +0000 +--- fontforge/splinefont.h.orig 2016-04-05 01:29:03.000000000 +0000 +++ fontforge/splinefont.h -@@ -3548,6 +3548,10 @@ char * delimit_null(const char * input, +@@ -3549,6 +3549,20 @@ char * delimit_null(const char * input, #include "ustring.h" +#ifdef __NetBSD__ +#define BAD_LOCALE_HACK ++#ifndef __LOCALE_T_DECLARED ++typedef char* locale_t; ++#define LC_GLOBAL_LOCALE ((locale_t)-1) ++#define LC_ALL_MASK LC_ALL ++#define LC_COLLATE_MASK LC_COLLATE ++#define LC_CTYPE_MASK LC_CTYPE ++#define LC_MONETARY_MASK LC_MONETARY ++#define LC_NUMERIC_MASK LC_NUMERIC ++#define LC_TIME_MASK LC_TIME ++#endif +#endif + #ifdef _WIN32 |