diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-05-17 10:37:23 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-05-17 10:37:23 +0000 |
| commit | 930dbe8cbe8ca9fd7a3f196f12610a744c82cb44 (patch) | |
| tree | fb8f076367d2c501aea06ddcd081a2410c30f0e6 /x11 | |
| parent | fd84eabd9b09fb00b496bbfca52b45693eccdba8 (diff) | |
| download | pkgsrc-930dbe8cbe8ca9fd7a3f196f12610a744c82cb44.tar.gz | |
fltk: Use std::min correctly.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk/distinfo | 3 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-src_fl__draw.cxx | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo index 12c1ce5e0e6..b8b875515e9 100644 --- a/x11/fltk/distinfo +++ b/x11/fltk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2015/11/04 03:28:29 agc Exp $ +$NetBSD: distinfo,v 1.26 2018/05/17 10:37:23 jperkin Exp $ SHA1 (fltk-1.1.10-source.tar.bz2) = 0d2b34fede91fa78eeaefb893dd70282f73908a8 RMD160 (fltk-1.1.10-source.tar.bz2) = f8fc4371811efcc0d6fc73edd0525d8ff87a4faa @@ -13,3 +13,4 @@ SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86 SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704 SHA1 (patch-fluid_Fl__Type.h) = b2ea0bebf152ab0755135fbe8cc6179d2f6d79e1 +SHA1 (patch-src_fl__draw.cxx) = 824ee95fe997ed553b88801569b35f3698d11898 diff --git a/x11/fltk/patches/patch-src_fl__draw.cxx b/x11/fltk/patches/patch-src_fl__draw.cxx new file mode 100644 index 00000000000..bb0a0bce91d --- /dev/null +++ b/x11/fltk/patches/patch-src_fl__draw.cxx @@ -0,0 +1,25 @@ +$NetBSD: patch-src_fl__draw.cxx,v 1.1 2018/05/17 10:37:23 jperkin Exp $ + +Use std::min correctly. + +--- src/fl_draw.cxx.orig 2006-12-21 19:39:26.000000000 +0000 ++++ src/fl_draw.cxx +@@ -32,14 +32,17 @@ + // Expands all unprintable characters to ^X or \nnn notation + // Aligns them against the inside of the box. + +-#define min(a,b) ((a)<(b)?(a):(b)) ++//#define min(a,b) ((a)<(b)?(a):(b)) + #include <FL/fl_draw.H> + #include <FL/Fl_Image.H> + + #include "flstring.h" ++#include <algorithm> + #include <ctype.h> + #include <math.h> + ++using std::min; ++ + #define MAXBUF 1024 + + char fl_draw_shortcut; // set by fl_labeltypes.cxx |