Date: Wednesday, December 14, 2016 @ 16:29:35 Author: arojas Revision: 283303
Fix hylafax (FS#52006) Added: libtiff/trunk/fix-hylafax.patch Modified: libtiff/trunk/PKGBUILD -------------------+ PKGBUILD | 13 ++++++++++--- fix-hylafax.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-14 13:59:16 UTC (rev 283302) +++ PKGBUILD 2016-12-14 16:29:35 UTC (rev 283303) @@ -3,7 +3,7 @@ pkgname=libtiff pkgver=4.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') url="http://www.simplesystems.org/libtiff/" @@ -11,9 +11,16 @@ depends=('gcc-libs' 'libjpeg' 'zlib' 'xz') makedepends=('freeglut' 'glu' 'mesa' 'jbigkit') optdepends=('freeglut: for using tiffgt') -source=(http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('2c1b64478e88f93522a42dd5271214a0e5eae648') +source=(http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz fix-hylafax.patch) +sha1sums=('2c1b64478e88f93522a42dd5271214a0e5eae648' + '32166444112dc283ffa4ffdb56c81f246243434c') +prepare() { + cd tiff-$pkgver + # http://bugzilla.maptools.org/show_bug.cgi?id=2636 + patch -p1 -i ../fix-hylafax.patch +} + build() { cd tiff-${pkgver} ./configure --prefix=/usr Added: fix-hylafax.patch =================================================================== --- fix-hylafax.patch (rev 0) +++ fix-hylafax.patch 2016-12-14 16:29:35 UTC (rev 283303) @@ -0,0 +1,33 @@ +From 7757b91a71631ada835740733f3dab51eda36df8 Mon Sep 17 00:00:00 2001 +From: erouault <erouault> +Date: Tue, 13 Dec 2016 18:15:48 +0000 +Subject: [PATCH] * libtiff/tif_fax3.h: revert change done on 2016-01-09 that + made Param member of TIFFFaxTabEnt structure a uint16 to reduce size of the + binary. It happens that the Hylafax software uses the tables that follow this + typedef (TIFFFaxMainTable, TIFFFaxWhiteTable, TIFFFaxBlackTable), also they + are not in a public libtiff header. Raised by Lee Howard. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2636 + +--- + ChangeLog | 10 ++++++++++ + libtiff/tif_fax3.h | 4 +++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h +index aafb5a7..2b64290 100644 +--- a/libtiff/tif_fax3.h ++++ b/libtiff/tif_fax3.h +@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32); + #define S_MakeUp 11 + #define S_EOL 12 + ++/* WARNING: do not change the layout of this structure as the Halyfax software */ ++/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */ + typedef struct { /* state table entry */ + unsigned char State; /* see above */ + unsigned char Width; /* width of code in bits */ +- uint16 Param; /* unsigned 16-bit run length in bits */ ++ uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */ + } TIFFFaxTabEnt; + + extern const TIFFFaxTabEnt TIFFFaxMainTable[];