[csw-devel] SF.net SVN: gar:[20563] csw/mgar/pkg/htmldoc/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Mon Apr 1 22:52:54 CEST 2013
Revision: 20563
http://gar.svn.sourceforge.net/gar/?rev=20563&view=rev
Author: chninkel
Date: 2013-04-01 20:52:54 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
htmldoc/trunk: rebuilt against libssl 1.0.0
Modified Paths:
--------------
csw/mgar/pkg/htmldoc/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch
Modified: csw/mgar/pkg/htmldoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/htmldoc/trunk/Makefile 2013-04-01 13:46:50 UTC (rev 20562)
+++ csw/mgar/pkg/htmldoc/trunk/Makefile 2013-04-01 20:52:54 UTC (rev 20563)
@@ -2,7 +2,7 @@
VERSION = 1.8.27
GARTYPE = v2
-DESCRIPTION = converts HTML files and web pages into indexed HTML PostScript and PDF
+DESCRIPTION = Converts HTML files and web pages into indexed HTML PostScript and PDF
define BLURB
HTMLDOC is a program for writing documentation in HTML and producing indexed
HTML, PostScript, or PDF output (with tables of contents). It supports most
@@ -16,13 +16,17 @@
SPKG_DESC_CSWhtmldoc-common = This package contains the htmldoc files common to all architectures.
ARCHALL_CSWhtmldoc-common = 1
-RUNTIME_DEP_PKGS_CSWhtmldoc = CSWfltk CSWjpeg CSWosslrt CSWpng CSWzlib
+RUNTIME_DEP_PKGS_CSWhtmldoc = CSWfltk CSWlibjpeg7 CSWlibssl1-0-0 CSWlibpng15-15 CSWlibz1
RUNTIME_DEP_PKGS_CSWhtmldoc += CSWhtmldoc-common
#RUNTIME_DEP_PKGS_CSWhtmldoc-common =
+CHECKPKG_OVERRIDES_CSWhtmldoc += surplus-dependency|CSWhtmldoc-common
+CHECKPKG_OVERRIDES_CSWhtmldoc-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/htmldoc.1
+
PKGFILES_CSWhtmldoc = $(bindir)/.*
PKGFILES_CSWhtmldoc-common = $(datadir)/.*
+
MASTER_SITES = http://ftp.easysw.com/pub/htmldoc/$(VERSION)/
DISTFILES = $(NAME)-$(VERSION)-source.tar.bz2
#DISTFILES += $(call admfiles,CSWhtmldoc, )
@@ -41,6 +45,8 @@
PATCHFILES = mainpatch
+PATCHFILES += 0002-libpng15-compatibility-fix.patch
+
CONFIGURE_ARGS = $(DIRPATHS)
TEST_SCRIPTS =
@@ -48,3 +54,6 @@
# Disable check until package is released
#ENABLE_CHECK = 0
include gar/category.mk
+
+post-configure:
+ gsed -i -e 's/-xnorunpath//' $(WORKSRC)/Makedefs
Added: csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch
===================================================================
--- csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch (rev 0)
+++ csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch 2013-04-01 20:52:54 UTC (rev 20563)
@@ -0,0 +1,118 @@
+From 4e383faed46df19cde2f83e83d60e7c6606487df Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Mon, 1 Apr 2013 01:49:30 +0200
+Subject: [PATCH] libpng15 compatibility fix
+
+---
+ htmldoc/image.cxx | 31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/htmldoc/image.cxx b/htmldoc/image.cxx
+index 574ff7c..22ed300 100644
+--- a/htmldoc/image.cxx
++++ b/htmldoc/image.cxx
+@@ -1472,6 +1472,9 @@ image_load_png(image_t *img, /* I - Image pointer */
+ png_bytep *rows; /* PNG row pointers */
+ uchar *inptr, /* Input pixels */
+ *outptr; /* Output pixels */
++ png_bytep trans_alpha;
++ int num_trans;
++ png_color_16p trans_color;
+
+
+ /*
+@@ -1499,7 +1502,7 @@ image_load_png(image_t *img, /* I - Image pointer */
+
+ rows = NULL;
+
+- if (setjmp(pp->jmpbuf))
++ if (setjmp(png_jmpbuf(pp)))
+ {
+ progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
+
+@@ -1526,7 +1529,9 @@ image_load_png(image_t *img, /* I - Image pointer */
+
+ png_read_info(pp, info);
+
+- if (info->color_type & PNG_COLOR_MASK_PALETTE)
++ png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color);
++
++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+ {
+ png_set_expand(pp);
+
+@@ -1535,15 +1540,15 @@ image_load_png(image_t *img, /* I - Image pointer */
+ 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 +1559,10 @@ image_load_png(image_t *img, /* I - Image pointer */
+ 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) || num_trans)
+ {
+ if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
+ image_need_mask(img, 8);
+@@ -1576,7 +1581,7 @@ image_load_png(image_t *img, /* I - Image pointer */
+ puts(" COLOR");
+ else
+ puts(" GRAYSCALE");
+- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++ if ((info->color_type & PNG_COLOR_MASK_ALPHA) || num_trans)
+ puts(" ALPHA");
+ if (info->color_type & PNG_COLOR_MASK_PALETTE)
+ puts(" PALETTE");
+@@ -1594,9 +1599,9 @@ image_load_png(image_t *img, /* I - Image pointer */
+ * 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 +1615,7 @@ image_load_png(image_t *img, /* I - Image pointer */
+ * 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) || num_trans)
+ {
+ #ifdef DEBUG
+ for (inptr = img->pixels, i = 0; i < img->height; i ++)
+@@ -1639,7 +1644,7 @@ image_load_png(image_t *img, /* I - Image pointer */
+ * 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...
+--
+1.8.1.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list