diff options
| author | joerg <joerg@pkgsrc.org> | 2013-04-30 22:19:27 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-04-30 22:19:27 +0000 |
| commit | 7896e2bed2750213796ec1a73afa5756f5bfccbf (patch) | |
| tree | 3dbd6cfb7576c1208a8e4f1e6d59c2f5509ee1df /fonts/mminstance | |
| parent | dcbd6c1a67d41bef504171f26a37950bd6d1058c (diff) | |
| download | pkgsrc-7896e2bed2750213796ec1a73afa5756f5bfccbf.tar.gz | |
Fix forward declaration. Avoid static_assert from C++11.
Diffstat (limited to 'fonts/mminstance')
| -rw-r--r-- | fonts/mminstance/distinfo | 4 | ||||
| -rw-r--r-- | fonts/mminstance/patches/patch-libefont_t1interp.cc | 24 | ||||
| -rw-r--r-- | fonts/mminstance/patches/patch-mmpfb_myfont.hh | 15 |
3 files changed, 42 insertions, 1 deletions
diff --git a/fonts/mminstance/distinfo b/fonts/mminstance/distinfo index d2b2181d316..d2d1331d746 100644 --- a/fonts/mminstance/distinfo +++ b/fonts/mminstance/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2008/09/19 23:59:52 joerg Exp $ +$NetBSD: distinfo,v 1.5 2013/04/30 22:19:27 joerg Exp $ SHA1 (mminstance-1.20.tar.gz) = 599cace92339e4120d30db40dfd157e400c745c8 RMD160 (mminstance-1.20.tar.gz) = 6e5d190a8459d8c737782eeec8a7a7d9bf676d8a Size (mminstance-1.20.tar.gz) = 191723 bytes SHA1 (patch-aa) = d601f1bdaec7de91d64d0b7b9ccabf85522dada2 SHA1 (patch-ab) = 8c73881e0c9f08eebd8c0ea2ff6e358469faefba +SHA1 (patch-libefont_t1interp.cc) = 1fd79f69e3c95f870e9f215c135d18b490c1c640 +SHA1 (patch-mmpfb_myfont.hh) = ca74679427ec1c9815b0d93be848aae46876a0b5 diff --git a/fonts/mminstance/patches/patch-libefont_t1interp.cc b/fonts/mminstance/patches/patch-libefont_t1interp.cc new file mode 100644 index 00000000000..5f67b342ee7 --- /dev/null +++ b/fonts/mminstance/patches/patch-libefont_t1interp.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-libefont_t1interp.cc,v 1.1 2013/04/30 22:19:28 joerg Exp $ + +--- libefont/t1interp.cc.orig 2013-04-30 11:11:16.000000000 +0000 ++++ libefont/t1interp.cc +@@ -11,8 +11,8 @@ + #define CHECK_STACK(numargs) do { if (size() < numargs) return error(errUnderflow, cmd); } while (0) + #define CHECK_STATE() do { if (_state < S_IPATH) return error(errOrdering, cmd); _state = S_PATH; } while (0) + +-#ifndef static_assert +-# define static_assert(c) switch (c) case 0: case (c): ++#ifndef my_static_assert ++# define my_static_assert(c) switch (c) case 0: case (c): + #endif + + namespace Efont { +@@ -74,7 +74,7 @@ CharstringInterp::error(int err, int err + String + CharstringInterp::error_string(int error, int error_data) + { +- static_assert(-errLastError == (sizeof(error_formats) / sizeof(error_formats[0])) - 1); ++ my_static_assert(-errLastError == (sizeof(error_formats) / sizeof(error_formats[0])) - 1); + if (error >= 0) + return error_formats[0]; + else if (error < errLastError) diff --git a/fonts/mminstance/patches/patch-mmpfb_myfont.hh b/fonts/mminstance/patches/patch-mmpfb_myfont.hh new file mode 100644 index 00000000000..041078ee747 --- /dev/null +++ b/fonts/mminstance/patches/patch-mmpfb_myfont.hh @@ -0,0 +1,15 @@ +$NetBSD: patch-mmpfb_myfont.hh,v 1.1 2013/04/30 22:19:28 joerg Exp $ + +--- mmpfb/myfont.hh.orig 2013-04-30 11:12:05.000000000 +0000 ++++ mmpfb/myfont.hh +@@ -1,7 +1,9 @@ + #ifndef MYFONT_HH + #define MYFONT_HH + #include <efont/t1font.hh> +-class Efont::EfontMMSpace; ++namespace Efont { ++class EfontMMSpace; ++} + class ErrorHandler; + + class MyFont: public Efont::Type1Font { public: |