CVS commit: pkgsrc/x11/fltk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 17 10:37:23 UTC 2018

Modified Files:
        pkgsrc/x11/fltk: distinfo
Added Files:
        pkgsrc/x11/fltk/patches: patch-src_fl__draw.cxx

Log Message:
fltk: Use std::min correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/fltk/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/fltk/patches/patch-src_fl__draw.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/fltk/distinfo
diff -u pkgsrc/x11/fltk/distinfo:1.25 pkgsrc/x11/fltk/distinfo:1.26
--- pkgsrc/x11/fltk/distinfo:1.25       Wed Nov  4 03:28:29 2015
+++ pkgsrc/x11/fltk/distinfo    Thu May 17 10:37:23 2018
@@ -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) = 791ba33cfc85e41e0f2b75
 SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86
 SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704
 SHA1 (patch-fluid_Fl__Type.h) = b2ea0bebf152ab0755135fbe8cc6179d2f6d79e1
+SHA1 (patch-src_fl__draw.cxx) = 824ee95fe997ed553b88801569b35f3698d11898

Added files:

Index: pkgsrc/x11/fltk/patches/patch-src_fl__draw.cxx
diff -u /dev/null pkgsrc/x11/fltk/patches/patch-src_fl__draw.cxx:1.1
--- /dev/null   Thu May 17 10:37:23 2018
+++ pkgsrc/x11/fltk/patches/patch-src_fl__draw.cxx      Thu May 17 10:37:23 2018
@@ -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