Bug#931968: stretch-pu: package libtk-img/1:1.4.6+dfsg-1+deb9u1 pre-approval

[Sergei Golovan]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu

Hi release team,

I'd like to fix #931422 (see [1]) for stretch (the bug is already fixed
in unstable, see also #931967 [2]).

The diff with the current 1:1.4.6+dfsg-1 is attaced.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931422
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931967

-- System Information:
Debian Release: 10.0
  APT prefers stable-debug
  APT policy: (500, 'stable-debug'), (500, 'oldoldstable'), (500, 'stable'), 
(500, 'oldstable'), (1, 'experimental'), (1, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/12 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru libtk-img-1.4.6+dfsg/debian/changelog 
libtk-img-1.4.6+dfsg/debian/changelog
--- libtk-img-1.4.6+dfsg/debian/changelog       2017-01-17 11:24:03.000000000 
+0300
+++ libtk-img-1.4.6+dfsg/debian/changelog       2019-07-12 17:28:05.000000000 
+0300
@@ -1,3 +1,10 @@
+libtk-img (1:1.4.6+dfsg-1+deb9u1) stretch; urgency=medium
+
+  * Switch from the internal copies of Jpeg, Zlib and PixarLog codecs to the
+    libtiff ones (closes: #931422).
+
+ -- Sergei Golovan <sgolo...@debian.org>  Fri, 12 Jul 2019 17:28:05 +0300
+
 libtk-img (1:1.4.6+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru libtk-img-1.4.6+dfsg/debian/patches/libtiff.diff 
libtk-img-1.4.6+dfsg/debian/patches/libtiff.diff
--- libtk-img-1.4.6+dfsg/debian/patches/libtiff.diff    2016-04-06 
23:11:12.000000000 +0300
+++ libtk-img-1.4.6+dfsg/debian/patches/libtiff.diff    2019-07-12 
17:28:05.000000000 +0300
@@ -327,6 +327,21 @@
            TIFFTileRowSize     && TIFFScanlineSize && _TIFFsetByteArray &&
            TIFFVSetField       && TIFFSwabArrayOfShort
            ) {
+@@ -125,14 +125,10 @@
+         if (Zlibtcl_InitStubs(interp, ZLIBTCL_VERSION, 0) == NULL) {
+           return TCL_ERROR;
+         }
+-        TIFFRegisterCODEC (COMPRESSION_DEFLATE,  "Deflate",  
TkimgTIFFInitZip);
+-        TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", 
TkimgTIFFInitZip);
+ 
+         if (Jpegtcl_InitStubs(interp, JPEGTCL_VERSION, 0) == NULL) {
+           return TCL_ERROR;
+         }
+-        TIFFRegisterCODEC (COMPRESSION_JPEG,     "JPEG",     
TkimgTIFFInitJpeg);
+-        TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", 
TkimgTIFFInitPixar);
+       }
+     }
+     return TCL_OK;
 --- a/tiff/tiffJpeg.c
 +++ b/tiff/tiffJpeg.c
 @@ -1599,7 +1599,7 @@
@@ -360,3 +375,25 @@
      sp->vgetparent     = tif->tif_tagmethods.vgetfield;
      tif->tif_tagmethods.vgetfield = ZIPVGetField;     /* hook for codec tags 
*/
      sp->vsetparent     = tif->tif_tagmethods.vsetfield;
+--- a/tiff/configure
++++ b/tiff/configure
+@@ -8244,7 +8244,7 @@
+ #-----------------------------------------------------------------------
+ 
+ 
+-    vars="tiff.c tiffJpeg.c tiffZip.c tiffPixar.c"
++    vars="tiff.c"
+     for i in $vars; do
+       case $i in
+           \$*)
+--- a/tiff/configure.in
++++ b/tiff/configure.in
+@@ -75,7 +75,7 @@
+ # and PKG_TCL_SOURCES.
+ #-----------------------------------------------------------------------
+ 
+-TEA_ADD_SOURCES([tiff.c tiffJpeg.c tiffZip.c tiffPixar.c])
++TEA_ADD_SOURCES([tiff.c])
+ TEA_ADD_HEADERS([])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${tkimg_SRC_PATH}`\"])