diff options
| author | wiz <wiz> | 2011-03-01 09:53:16 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-03-01 09:53:16 +0000 |
| commit | 2b1200e1e9101e25f3c78a4b9586faabde531977 (patch) | |
| tree | c688806ac9a1cd4998ef0ba335240a6369bda2d5 /x11 | |
| parent | 8e0102c829823ce8dcf0600496183a7ed3af84ce (diff) | |
| download | pkgsrc-2b1200e1e9101e25f3c78a4b9586faabde531977.tar.gz | |
Probably final version of patch. Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk/Makefile | 4 | ||||
| -rw-r--r-- | x11/fltk/distinfo | 4 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ah | 14 |
3 files changed, 10 insertions, 12 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 95d46bbdb44..b67975ddbcf 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.74 2011/01/13 13:36:09 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2011/03/01 09:53:16 wiz Exp $ DISTNAME= fltk-1.1.10-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${DISTNAME:S/fltk-//:S/-source//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://ftp.easysw.com/pub/fltk/${VERS}/ \ ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \ diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo index bd2b6f9e9f1..0f1c5e3f1f5 100644 --- a/x11/fltk/distinfo +++ b/x11/fltk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2011/02/28 15:38:12 wiz Exp $ +$NetBSD: distinfo,v 1.23 2011/03/01 09:53:16 wiz Exp $ SHA1 (fltk-1.1.10-source.tar.bz2) = 0d2b34fede91fa78eeaefb893dd70282f73908a8 RMD160 (fltk-1.1.10-source.tar.bz2) = f8fc4371811efcc0d6fc73edd0525d8ff87a4faa @@ -10,4 +10,4 @@ SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80 SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86 -SHA1 (patch-ah) = 8e5bae5af1220e7b5758d8c6bb2bbe5caeffb8d5 +SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704 diff --git a/x11/fltk/patches/patch-ah b/x11/fltk/patches/patch-ah index 3e03c318c6d..8dfdef2fbd0 100644 --- a/x11/fltk/patches/patch-ah +++ b/x11/fltk/patches/patch-ah @@ -1,21 +1,19 @@ -$NetBSD: patch-ah,v 1.6 2011/02/28 15:38:13 wiz Exp $ +$NetBSD: patch-ah,v 1.7 2011/03/01 09:53:16 wiz Exp $ Fix build with png-1.5. http://www.fltk.org/str.php?L2542+P0+S-2+C0+I0+E0+Q --- src/Fl_PNG_Image.cxx.orig 2006-06-09 16:16:34.000000000 +0000 +++ src/Fl_PNG_Image.cxx -@@ -66,6 +66,9 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p +@@ -66,6 +66,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p png_structp pp; // PNG read pointer png_infop info; // PNG info pointers png_bytep *rows; // PNG row pointers -+ png_bytep trans_alpha; -+ int num_trans; -+ png_color_16p trans_color; ++ int num_trans = 0; // PNG # of transp. colors // Open the PNG file... -@@ -75,7 +78,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p +@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); info = png_create_info_struct(pp); @@ -24,7 +22,7 @@ http://www.fltk.org/str.php?L2542+P0+S-2+C0+I0+E0+Q { Fl::warning("PNG file \"%s\" contains errors!\n", png); return; -@@ -87,27 +90,28 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p +@@ -87,27 +88,28 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p // Get the image dimensions and convert to grayscale or RGB... png_read_info(pp, info); @@ -39,7 +37,7 @@ http://www.fltk.org/str.php?L2542+P0+S-2+C0+I0+E0+Q channels = 1; - if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) -+ png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color); ++ png_get_tRNS(pp, info, 0, &num_trans, 0); + if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) channels ++; |