Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11603
Modified Files:
htmldoc.patch
Log Message:
unblock on 10.9 by switching to libjpeg9 and libpng16
Index: htmldoc.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/htmldoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- htmldoc.patch 25 Feb 2013 03:13:01 -0000 1.1
+++ htmldoc.patch 23 Jul 2013 23:54:58 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' htmldoc-1.8.27.orig/Makefile.in htmldoc-1.8.27/Makefile.in
---- htmldoc-1.8.27.orig/Makefile.in 2005-04-24 15:20:32.000000000 -0400
-+++ htmldoc-1.8.27/Makefile.in 2013-02-24 21:33:30.000000000 -0500
+diff -uNr htmldoc-1.8.27/Makefile.in htmldoc-1.8.27.fink/Makefile.in
+--- htmldoc-1.8.27/Makefile.in 2005-04-24 15:20:32.000000000 -0400
++++ htmldoc-1.8.27.fink/Makefile.in 2013-07-21 09:30:34.000000000 -0400
@@ -62,7 +62,7 @@
clean:
for dir in $(DIRS); do\
@@ -19,3 +19,180 @@
done
+diff -uNr htmldoc-1.8.27/htmldoc/image.cxx
htmldoc-1.8.27.fink/htmldoc/image.cxx
+--- htmldoc-1.8.27/htmldoc/image.cxx 2006-05-31 15:00:02.000000000 -0400
++++ htmldoc-1.8.27.fink/htmldoc/image.cxx 2013-07-21 09:30:34.000000000
-0400
+@@ -3,23 +3,11 @@
+ *
+ * Image handling routines for HTMLDOC, a HTML document processing program.
+ *
+- * Copyright 1997-2005 by Easy Software Products.
++ * Copyright 2011 by Michael R Sweet.
++ * Copyright 1997-2010 by Easy Software Products. All rights reserved.
+ *
+- * These coded instructions, statements, and computer programs are the
+- * property of Easy Software Products and are protected by Federal
+- * copyright law. Distribution and use rights are outlined in the file
+- * "COPYING.txt" which should have been included with this file. If this
+- * file is missing or damaged please contact Easy Software Products
+- * at:
+- *
+- * Attn: ESP Licensing Information
+- * Easy Software Products
+- * 44141 Airport View Drive, Suite 204
+- * Hollywood, Maryland 20636-3142 USA
+- *
+- * Voice: (301) 373-9600
+- * EMail: i...@easysw.com
+- * WWW: http://www.easysw.com
++ * This program is free software. Distribution and use rights are outlined
in
++ * the file "COPYING.txt".
+ *
+ * Contents:
+ *
+@@ -1392,9 +1380,9 @@
+ cinfo.err = &jerr;
+ jpeg_create_decompress(&cinfo);
+ jpeg_stdio_src(&cinfo, fp);
+- jpeg_read_header(&cinfo, 1);
++ jpeg_read_header(&cinfo, TRUE);
+
+- cinfo.quantize_colors = 0;
++ cinfo.quantize_colors = FALSE;
+
+ if (gray || cinfo.num_components == 1)
+ {
+@@ -1499,7 +1487,7 @@
+
+ rows = NULL;
+
+- if (setjmp(pp->jmpbuf))
++ if (setjmp(png_jmpbuf(pp)))
+ {
+ progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
+
+@@ -1526,7 +1514,7 @@
+
+ png_read_info(pp, info);
+
+- if (info->color_type & PNG_COLOR_MASK_PALETTE)
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+ {
+ png_set_expand(pp);
+
+@@ -1535,15 +1523,15 @@
+ if (Encryption)
+ img->use ++;
+ }
+- else if (info->bit_depth < 8)
++ else if (png_get_bit_depth(pp, info) < 8)
+ {
+ png_set_packing(pp);
+ png_set_expand(pp);
+ }
+- else if (info->bit_depth == 16)
++ else if (png_get_bit_depth(pp, info) == 16)
+ png_set_strip_16(pp);
+
+- if (info->color_type & PNG_COLOR_MASK_COLOR)
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+ {
+ depth = 3;
+ img->depth = gray ? 1 : 3;
+@@ -1554,10 +1542,10 @@
+ img->depth = 1;
+ }
+
+- img->width = info->width;
+- img->height = info->height;
++ img->width = png_get_image_width(pp, info);
++ img->height = png_get_image_height(pp, info);
+
+- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA)
+ {
+ if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
+ image_need_mask(img, 8);
+@@ -1571,14 +1559,14 @@
+
+ #ifdef DEBUG
+ printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d,
img->depth=%d\n",
+- info->color_type, depth, img->width, img->height, img->depth);
+- if (info->color_type & PNG_COLOR_MASK_COLOR)
++ png_get_color_type(pp, info), depth, img->width, img->height,
img->depth);
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+ puts(" COLOR");
+ else
+ puts(" GRAYSCALE");
+- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA)
+ puts(" ALPHA");
+- if (info->color_type & PNG_COLOR_MASK_PALETTE)
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+ puts(" PALETTE");
+ #endif // DEBUG
+
+@@ -1594,9 +1582,9 @@
+ * Allocate pointers...
+ */
+
+- rows = (png_bytep *)calloc(info->height, sizeof(png_bytep));
++ rows = (png_bytep *)calloc(png_get_image_height(pp, info),
sizeof(png_bytep));
+
+- for (i = 0; i < (int)info->height; i ++)
++ for (i = 0; i < (int)png_get_image_height(pp, info); i ++)
+ rows[i] = img->pixels + i * img->width * depth;
+
+ /*
+@@ -1610,7 +1598,7 @@
+ * Generate the alpha mask as necessary...
+ */
+
+- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA)
+ {
+ #ifdef DEBUG
+ for (inptr = img->pixels, i = 0; i < img->height; i ++)
+@@ -1639,7 +1627,7 @@
+ * Reformat the data as necessary for the reader...
+ */
+
+- if (gray && info->color_type & PNG_COLOR_MASK_COLOR)
++ if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+ {
+ /*
+ * Greyscale output needed...
+@@ -1720,7 +1708,7 @@
+ {
+ // Alpha mask
+ img->maskwidth = (img->width * scaling + 7) / 8;
+- size = img->maskwidth * img->height * scaling;
++ size = img->maskwidth * img->height * scaling + 1;
+ }
+
+ img->mask = (uchar *)calloc(size, 1);
+diff -uNr htmldoc-1.8.27/jpeg/jmorecfg.h htmldoc-1.8.27.fink/jpeg/jmorecfg.h
+--- htmldoc-1.8.27/jpeg/jmorecfg.h 2000-11-08 17:23:26.000000000 -0500
++++ htmldoc-1.8.27.fink/jpeg/jmorecfg.h 2013-07-21 09:30:34.000000000
-0400
+@@ -176,14 +176,15 @@
+ * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
+ */
+
+-#ifndef HAVE_BOOLEAN
+-typedef char boolean;
+-#endif
+-#ifndef FALSE /* in case these macros already exist */
+-#define FALSE 0 /* values of boolean */
++#ifdef HAVE_BOOLEAN
++#ifndef FALSE /* in case these macros already exist */
++#define FALSE 0 /* values of boolean */
+ #endif
+ #ifndef TRUE
+-#define TRUE 1
++#define TRUE 1
++#endif
++#else
++typedef enum { FALSE = 0, TRUE = 1 } boolean;
+ #endif
+
+
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
