htmldoc_remote_compile_wrapper 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fab4de30f058f763f9123fef205b251d3addd63
-  data.tar.gz: c2c2ba4150f18d5b469fc83ea25ac09dd52f43db
+  metadata.gz: 43e73a78a30544090d9386d31c53f129438fa1a8
+  data.tar.gz: f14b4cc5cb8d23b9f6f48a6be201e87c18ffd968
 SHA512:
-  metadata.gz: d7ddef0bace28b4bda541256f1cb1956e50be47767893280233b8087ad3e82960899fa3a0dbd18667962a5b50bd67899003a0e283214e44a23506c6ca55043a6
-  data.tar.gz: 4726ce05a6dd1bad29abefd986475bf291ade1d263b79a1d4d71e819015f4d62b6715699865610cb7b219db6205c4a5cb058f511400d73218723932e46d30933
+  metadata.gz: 6473e8901aaec720cae33827652a75e82f92530ba3fc7f7fded8f839d77154e269a1e51015bc0f1214bf112454f747eb7e9c5ca1845c98379748aa4624904dbf
+  data.tar.gz: 3d5dd944e3427d16e75459ff9ef25d6e1e47fc7f1f6c3492142cd0ef984b626cb8b787fb8e2933bff098bbc6ceeac17d83361a3775b76842971363b1c6cfdf33

data/ext/extconf.rb

@@ -3,19 +3,13 @@ require 'mkmf'
 root = File.expand_path('../..', __FILE__)
 src_dir = File.join(root, 'src')
 bin_dir = File.join(root, 'bin')
-tgz_filename = "htmldoc-1.8.27-source.tar.gz"
+tgz_filename = "htmldoc-1.8.28-source.tar.gz"
 tgz_file = File.join(src_dir, tgz_filename)
-# 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_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 <#{patch_filename}"
   puts "===> Configuring with prefix: #{root}"
   system "./configure --prefix=#{root}"
   puts "===> Building..."

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.5"
+  gem.version       = "0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmldoc_remote_compile_wrapper
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Joe Noon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Compile htmldoc binary
 email:
@@ -26,8 +26,7 @@ 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
+- src/htmldoc-1.8.28-source.tar.gz
 homepage: ''
 licenses: []
 metadata: {}
@@ -47,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Suitable for environments like Heroku.  Downloads the htmldoc source and

data/src/htmldoc-1.8.27-libpng15.patch

@@ -1,150 +0,0 @@
-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);