htmldoc_remote_compile_wrapper 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c45af9364c79275e11dcd0ae0ab4dec9737eba
-  data.tar.gz: 0eba21466d4f60c77403b074e3ffe7db84e87fc0
+  metadata.gz: 2fab4de30f058f763f9123fef205b251d3addd63
+  data.tar.gz: c2c2ba4150f18d5b469fc83ea25ac09dd52f43db
 SHA512:
-  metadata.gz: ad16b54d708888901983514b2ffe4099a586509c3004646fd43b9c043c8762b7c77ac84f6e0d9cb47ba524646eb4419cd3ed8b9b07e4340260a91be9d1a7c922
-  data.tar.gz: 11a9f678be112177d836f13f59f7c8143b34f21330f0eba65c0630669a593ee0100c6aa36fdffa426884ba9edac37e85978acc18c619154e19c7c61c4ef21259
+  metadata.gz: d7ddef0bace28b4bda541256f1cb1956e50be47767893280233b8087ad3e82960899fa3a0dbd18667962a5b50bd67899003a0e283214e44a23506c6ca55043a6
+  data.tar.gz: 4726ce05a6dd1bad29abefd986475bf291ade1d263b79a1d4d71e819015f4d62b6715699865610cb7b219db6205c4a5cb058f511400d73218723932e46d30933

data/ext/extconf.rb

@@ -1,38 +1,21 @@
 require 'mkmf'
-require 'fileutils'
-require 'open-uri'
 
 root = File.expand_path('../..', __FILE__)
 src_dir = File.join(root, 'src')
 bin_dir = File.join(root, 'bin')
-tgz_filename = "htmldoc.tgz"
+tgz_filename = "htmldoc-1.8.27-source.tar.gz"
 tgz_file = File.join(src_dir, tgz_filename)
-patch_file = File.join(src_dir, "libpng_patch")
-
-FileUtils.rm_rf src_dir
-FileUtils.mkdir src_dir
-
-source_url = "https://joenoon-public.s3.amazonaws.com/htmldoc-1.8.27-source.tar.gz"
 # Fixes building with libpng-1.5, from upstream svn r1668 via Fedora
 # Remove at version 1.8.28. cf. https://github.com/mxcl/homebrew/issues/15915
-patch_url = "https://gist.github.com/joenoon/5733730/raw/4da9eca3b0ba0f3d1303769bdc408729b8654632/gistfile1.diff"
-
-puts "===> Downloading: #{source_url} to #{tgz_file}"
-
-open(tgz_file, "wb") do |file|  
-  file.print open(source_url).read
-end
-
-open(patch_file, "wb") do |file|  
-  file.print open(patch_url).read
-end
+patch_filename = "htmldoc-1.8.27-libpng15.patch"
+patch_file = File.join(src_dir, patch_filename)
 
 Dir.chdir(src_dir) do
   puts "===> Changing to directory: #{src_dir}"
   puts "===> Extracting #{tgz_filename}"
   system "tar xzf #{tgz_filename} --strip-components=1"
   puts "===> Patching"
-  system "patch -p0 <libpng_patch"
+  system "patch -p0 <#{patch_filename}"
   puts "===> Configuring with prefix: #{root}"
   system "./configure --prefix=#{root}"
   puts "===> Building..."
@@ -44,8 +27,6 @@ Dir.chdir(src_dir) do
   system "make clean"
 end
 
-FileUtils.rm_rf src_dir
-
 puts "===> Done compiling htmldoc."
 
 create_makefile 'htmldoc_remote_compile_wrapper'

data/htmldoc_remote_compile_wrapper.gemspec

@@ -12,5 +12,5 @@ Gem::Specification.new do |gem|
   gem.extensions    = ['ext/extconf.rb']
   gem.name          = "htmldoc_remote_compile_wrapper"
   gem.require_paths = ["lib"]
-  gem.version       = "0.4"
+  gem.version       = "0.5"
 end

data/src/htmldoc-1.8.27-libpng15.patch

@@ -0,0 +1,150 @@
+Original http://pkgs.fedoraproject.org/cgit/htmldoc.git/plain/htmldoc-1.8.27-libpng15.patch?h=f18
+
+From upstream 1.8 branch svn r1668
+
+The previous libpng-1.5 conversion patch here caused corrupt PNG output
+on 64 bit. e.g. http://answerpot.com/showthread.php?3662601-PNG+Rendering+Problems
+
+The upstream version (below) works well.
+
+Index: htmldoc/image.cxx
+===================================================================
+--- htmldoc/image.cxx.orig
++++ htmldoc/image.cxx
+@@ -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: info@easysw.com
+- *         WWW: http://www.easysw.com
++ *   This program is free software.  Distribution and use rights are outlined in
++ *   the file "COPYING.txt".
+  *
+  * Contents:
+  *
+@@ -1499,7 +1487,7 @@ image_load_png(image_t *img,  /* I - Imag
+ 
+   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 @@ image_load_png(image_t *img,  /* I - Imag
+ 
+   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 @@ image_load_png(image_t *img,  /* I - Imag
+     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 @@ image_load_png(image_t *img,  /* I - Imag
+     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 @@ image_load_png(image_t *img,  /* I - Imag
+ 
+ #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 @@ image_load_png(image_t *img,  /* I - Imag
+   * 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 @@ image_load_png(image_t *img,  /* I - Imag
+   * 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 @@ image_load_png(image_t *img,  /* I - Imag
+   * 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 @@ image_need_mask(image_t *img, /* I - Ima
+   {
+     // 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);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmldoc_remote_compile_wrapper
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Joe Noon
@@ -26,6 +26,8 @@ files:
 - ext/extconf.rb
 - htmldoc_remote_compile_wrapper.gemspec
 - lib/htmldoc_remote_compile_wrapper.rb
+- src/htmldoc-1.8.27-libpng15.patch
+- src/htmldoc-1.8.27-source.tar.gz
 homepage: ''
 licenses: []
 metadata: {}