debian/0000775000000000000000000000000012254221104007161 5ustar debian/README.Debian0000664000000000000000000000163312252771677011254 0ustar libtk-img for Debian -------------------- Basic notes on the use of this package: tclsh% package require Img will load the Img library. Once loaded, it adds format handlers so that [create image photo -format foo] can handle more formats. Specifically, Img provides support for bmp, gif, jpeg, png, tiff, xbm, xpm, postscript, and pdf image formats. For more information on the image handlers and usage, see /usr/share/doc/libtk-img/README. -- Another point of interest may be the extreme amounts of hacking done to the source tree. Upstream includes their own copies of libjpeg, libpng, libtiff, and libz, to be used in case they're missing on the system. I've excised these as much as possible, so the source tarball isn't exactly pristine. The principal exception to this pruning is a bunch of libtiff header files needed for the tiff support. -- Mike Markley , Tue, 12 Jun 2001 18:34:47 -0700 debian/source/0000775000000000000000000000000012253361520010467 5ustar debian/source/lintian-overrides0000664000000000000000000000043712252771677014075 0ustar # Only headers are used in libtiff/ and libjpeg/ for building the package. So # it's harmless to keep old helpers. libtk-img source: ancient-autotools-helper-file compat/libtiff/config.guess 2003-10-07 libtk-img source: ancient-autotools-helper-file compat/libtiff/config.sub 2003-10-07 debian/source/format0000664000000000000000000000001412252771677011716 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000000544011757477236011151 0ustar This package was debianized by Mike Markley on Tue, 12 Jun 2001 18:34:47 -0700. It was downloaded from http://sourceforge.net/projects/tkimg/ Upstream Author: Jan Nijtmans Copyright: Copyright 1997-2004 Jan Nijtmans This software is copyrighted by Jan Nijtmans (the maintainer) and a lot of other people who contributed code (most notably Andreas Kupries, Thomas G. Lane, Ioi K. Lam, Mario Weilguni and Roger E Critchlow Jr). The following terms apply to all files associated with the software unless explicitly disclaimed in individual files. The authors hereby grant permission to use, copy, modify, distribute, and license this software and its documentation for any purpose, provided that existing copyright notices are retained in all copies and that this notice is included verbatim in any distributions. No written agreement, license, or royalty fee is required for any of the authorized uses. Modifications to this software may be copyrighted by their authors and need not follow the licensing terms described here, provided that the new terms are clearly indicated on the first page of each file where they apply. IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" in the software and related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the Government shall have only "Restricted Rights" as defined in Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the authors grant the U.S. Government and others acting in its behalf permission to use and distribute the software in accordance with the terms specified in this license. ------------------------------------------------------------------ This package includes pngsuite with the following license: Copyright (c) Willem van Schaik, 1999, 2011 Permission to use, copy, modify, and distribute these images for any purpose and without fee is hereby granted. debian/libtk-img-dev.docs0000664000000000000000000000000710627251442012475 0ustar README debian/changelog0000664000000000000000000002661012254221076011050 0ustar libtk-img (1:1.4.2-4ubuntu1) trusty; urgency=low * Help system-wide libjpeg patch with an extra jconfig.h from multiarch include location. -- Dimitri John Ledkov Wed, 18 Dec 2013 04:18:38 +0000 libtk-img (1:1.4.2-4) unstable; urgency=low * Added a new hack which allows the libtk-img package to link against the system-wide libtiff library (closes: #732147). -- Sergei Golovan Sun, 15 Dec 2013 21:09:10 +0400 libtk-img (1:1.4.2-3) unstable; urgency=low * Fixed build on 32-bit architectures. -- Sergei Golovan Sun, 15 Dec 2013 15:27:41 +0400 libtk-img (1:1.4.2-2) unstable; urgency=low * Added a new hack which lets the libtk-img package use the system-wide libpng library. -- Sergei Golovan Sun, 15 Dec 2013 10:04:53 +0400 libtk-img (1:1.4.2-1) unstable; urgency=low * New upstream release. * Refreshed patches, removed obsolete ones. * Use internal copy of the libtiff library because libtk-img doesn't work with the newer version which is currently in unstable (closes: #732023). * Use internal copy of the libpng library because upstream switched to 1.4 while Debian have only 1.2 yet. * Don't install doc-base file because libtk-img doesn't come with HTML docs now. * Switched to 3.0 (quilt) source format and bumped debhelper compatibility level to 8. * Bumped standards version to 3.9.4. -- Sergei Golovan Sat, 14 Dec 2013 09:56:27 +0400 libtk-img (1:1.3-release-12) unstable; urgency=low * Enabled hardened build flags through dpkg-buildflags (closes: #657209). * Switched to libpng-dev from libpng12-dev in build dependencies (closes: #662413). * Documented the new pngsuite license in debian/copyright (closes: #615808). * Bumped standards version to 3.9.3. -- Sergei Golovan Thu, 24 May 2012 22:31:27 +0400 libtk-img (1:1.3-release-11) unstable; urgency=low * Fixed building with libjpeg8. * Bumped standards version to 3.9.2. * Added build-indep and build-arch targets into debian/rules. * Overridden lintian false positive on embedded tiff library. -- Sergei Golovan Mon, 19 Dec 2011 18:38:35 +0400 libtk-img (1:1.3-release-10) experimental; urgency=low * Upload to experimental to test compatibility with Tcl/Tk 8.5. * Bumped standards version to 3.9.0. -- Sergei Golovan Thu, 22 Jul 2010 22:29:22 +0400 libtk-img (1:1.3-release-9) unstable; urgency=low * Changed libjpeg62-dev to libjpeg-dev in build dependencies. * Added ${misc:Depends} variable to the binary packages dependencies because they are built using debhelper. * Added README.source with a description on how to patch the pristine sources with Debian patches. * Overridden lintian warning on an ancient autotools helper files in libtiff subdirectory because they aren't used when building the binary package. * Bumped standards version to 3.8.4. -- Sergei Golovan Sun, 14 Feb 2010 12:59:54 +0300 libtk-img (1:1.3-release-8) unstable; urgency=high * Applied patch by Nico Golde (previously created for Tk 8.4) which fixes security vulnerability CVE-2007-5137 arbitrary code execution via multi-frame interlaced GIF. * Applied patch by Nico Golde (previously created for Tk 8.4) which fixes security vulnerability CVE-2007-5378 overflow triggered by crafted GIF file (closes: #519072). * Set urgency to high as this upload fixes security vulnerabilities. * Mangled Debian version and use SF redirector in debian/watch uscan control file. * Overridden lintian warning on an ancient libtool version in libjpeg subdirectory because it isn't used when building the binary package. -- Sergei Golovan Sat, 14 Mar 2009 08:42:09 +0300 libtk-img (1:1.3-release-7) unstable; urgency=high * Fixed CVE-2008-0553 vulnerability (Stack-based buffer overflow in the ReadImage function in tkImgGIF.c allows remote attackers to execute arbitrary code via a crafted GIF image, a similar issue to CVE-2006-4484.) Thanks Nico Golde for the patch. Closes: #485785. * Set urgency to high as this upload fixes a security vulnerability. * Protected quilt invocation in debian/rules to make it possible to convert bwidget source package to 3.0 (quilt) format (closes: #482710). * Bumped standards version to 3.8.0. -- Sergei Golovan Sun, 15 Jun 2008 19:47:36 +0400 libtk-img (1:1.3-release-6) unstable; urgency=low * Removed tkv script from /usr/bin since it is not more than an example and isn't suitable for use as an image viewer. This allows to remove bashism echo -e from debian/rules (closes: #478608). * Moved all manpages and examples to a separate package libtk-img-doc to make the main package more lightweight. * Changed libtk-img section to libs and libtk-img-dev package section to libdevel as more appropriate. * Added a copyright notice to debian/copyright. * Fixed section in doc-base. * Use more recent ChangeLog file. * Bumped standards version to 3.7.3. -- Sergei Golovan Thu, 01 May 2008 01:34:53 +0400 libtk-img (1:1.3-release-5) unstable; urgency=low * Adapted the package to Debian Tcl/Tk policy. This includes moving the Tcl modules into a subdirectory of /usr/lib/tcltk and switching to default tk package in dependencies. * Added Homepage field in debian/control. -- Sergei Golovan Sun, 18 Nov 2007 19:47:26 +0300 libtk-img (1:1.3-release-4) unstable; urgency=low * Fixed build on hurd-i386, kfreebsd-i386 and kfreebsd-amd64 architectures. * Rewritten clean target in debian/rules to ignore only missing Makefile error. * Made clean-patched target in debian/rules depend on patch-stamp. -- Sergei Golovan Tue, 11 Sep 2007 18:26:54 +0400 libtk-img (1:1.3-release-3) unstable; urgency=low * New maintainer's email address sgolovan@debian.org. * Split the binary package into libtk-img and libtk-img-dev packages, moving development libraries and C-headers to a separate development package. * Added versioned build-dependency on zlib1g-dev. * Removed useless description of BMP image format from the binary package. * Removed tkv manpage from TODO.Debian because it is already written. * Added explicit --host and --build parameters to configure script call. -- Sergei Golovan Sat, 04 Aug 2007 21:50:58 +0400 libtk-img (1:1.3-release-2) unstable; urgency=low * Fixed package directory in jpegtclConfig.sh, tifftclConfig.sh, zlibtclConfig.sh, pngtclConfig.sh and tkimgConfig.sh scripts. -- Sergei Golovan Tue, 22 May 2007 21:29:47 +0400 libtk-img (1:1.3-release-1) unstable; urgency=low * New maintainer Sergei Golovan (closes: #383652). * New upstream release (it's labeled 1.3, so added -release suffix to the upstream version). * Install manual pages. * Install HTML docs to /usr/share/doc/libtk-img/html * Added debian/compat file instead of defining variable DH_COMPAT in debian/rules. * Added colons to bug closing statements in debian/changelog. * Link libjpegtcl, libpngtcl, libzlibtcl dynamically to libjpeg, libpng and zlib respectively instead of building own static libraries. * Updated libtiff to SVN version to make it possible to link libtifftcl to current libtiff4 dynamically. * Overridden lintian error message about outdated autotools helper files because they aren't used for building the package. * Do not install install.tcl (it isn't related to bug #221149). * Fixed demo.tcl and tkv.tcl scripts to run by wish8.4 and not wish8.3 because libtk-img is built using tk8.4. * Remove command, which is supposed to run test, from demo.tcl because they aren't available. * Added debian/watch uscan file. * Fixed homepage in debian/copyright and added it to debian/control. -- Sergei Golovan Sun, 13 May 2007 15:30:20 +0400 libtk-img (1:1.3-15) unstable; urgency=low * QA upload. * debian/doc-base: Change section to Apps/Programming. Thanks to Justin B Rye. Closes: #311816. * debian/override: Lintian no longer outputs `no-shlibs-control-file'; remove. -- Matej Vela Mon, 4 Sep 2006 13:59:17 +0200 libtk-img (1:1.3-14) unstable; urgency=low * QA Upload (Ack NMU; Closes: #359289, #355593) * Set Maintainer to QA Group; Orphaned: #383652 * Bump COMPAT to 4; Depend on at least dh 4.0.0 * Install tools/install.tcl with examples (Closes: 221149) * Conforms with Latest Standards Version 3.7.2 -- Michael Ablassmeier Sat, 2 Sep 2006 11:31:28 +0200 libtk-img (1:1.3-13.1) unstable; urgency=high * Non-maintainer upload. * Fix syntax error in tcl.m4 (Closes: #355593). -- Luk Claes Mon, 27 Mar 2006 19:09:11 +0200 libtk-img (1:1.3-13) unstable; urgency=low * Fixed mistake and now really fix the bug below. -- David N. Welton Mon, 14 Mar 2005 17:11:23 +0100 libtk-img (1:1.3-12) unstable; urgency=low * Bug fix: "libtk-img: segfaults when using with Tcl/Tk 8.3", thanks to Sergei Golovan (Closes: #299444). -- David N. Welton Mon, 14 Mar 2005 16:31:33 +0100 libtk-img (1:1.3-11) unstable; urgency=high * Recompiled against libtiff4. -- David N. Welton Sun, 8 Aug 2004 19:18:29 +0200 libtk-img (1:1.3-10) unstable; urgency=low * Remove config droppings from source file. * Compile against latest libpng. -- David N. Welton Sat, 26 Jul 2003 13:53:41 +0200 libtk-img (1.3rc2-9) unstable; urgency=low * Specify version. Recompile with Debian diff. * (closes: #186756) * (closes: #186759) -- David N. Welton Sun, 30 Mar 2003 01:02:08 -0800 libtk-img (1.3-8) unstable; urgency=low * A few more changes for lintian goodness. -- David N. Welton Wed, 26 Mar 2003 15:53:57 -0800 libtk-img (1.3-7) unstable; urgency=low * New upstream version. -- David N. Welton Wed, 26 Mar 2003 03:01:52 -0800 libtk-img (1.3-6) unstable; urgency=low * Recompiled for latest Tcl/Tk. -- David N. Welton Fri, 21 Mar 2003 11:52:52 -0800 libtk-img (1.3-5) unstable; urgency=low * Added patches from Andreas Kupries (upstream) to fix compile bugs. (closes: #177798) (closes: #179088) (closes: #177799) -- David N. Welton Wed, 5 Feb 2003 13:35:39 -0800 libtk-img (1.3-4) unstable; urgency=low * Updates from upstream CVS (closes: #176390). -- David N. Welton Tue, 14 Jan 2003 11:30:59 -0800 libtk-img (1.3-3) unstable; urgency=low * Something went wrong with the last upload. Let's do a new one. (closes: #175423) (closes: #17425) -- David N. Welton Sun, 5 Jan 2003 21:12:02 -0800 libtk-img (1.3-2) unstable; urgency=low * Make sure .so and .a files are cleaned up. (closes: #17425) -- David N. Welton Wed, 1 Jan 2003 19:43:21 -0800 libtk-img (1.3-1) unstable; urgency=low * New upstream release * New maintainer. * Packaged up sources from CVS. (closes: #172363) (closes: #172420) -- David N. Welton Thu, 19 Dec 2002 11:46:40 -0800 libtk-img (1.2.4-1) unstable; urgency=low * Initial Release (Closes: #100962). -- Mike Markley Tue, 12 Jun 2001 18:34:47 -0700 debian/control0000664000000000000000000000410012254221100010553 0ustar Source: libtk-img Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Sergei Golovan Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>=1.16.1~), tk-dev (>= 8.5.0), tcllib, zlib1g-dev (>= 1:1.2.1), libjpeg-dev, libpng-dev, libtiff-dev Standards-Version: 3.9.4 Homepage: http://sourceforge.net/projects/tkimg/ Package: libtk-img Section: libs Architecture: any Depends: ${shlibs:Depends}, ${wish:Depends}, ${misc:Depends} Suggests: libtk-img-doc Description: Extended image format support for Tcl/Tk (runtime) Img is a package to enhance Tk by providing support for various image formats such as XPM, GIF (transparency supported, but not LZW), PNG, JPEG, TIFF, and PostScript. . The libimg library can be loaded dynamically into Tcl/Tk scripts to provide the image handling functions. . This package includes runtime libraries. Package: libtk-img-dev Section: libdevel Architecture: any Depends: libtk-img (= ${binary:Version}), ${misc:Depends} Description: Extended image format support for Tcl/Tk (development files) Img is a package to enhance Tk by providing support for various image formats such as XPM, GIF (transparency supported, but not LZW), PNG, JPEG, TIFF, and PostScript. . The libimg library can be loaded dynamically into Tcl/Tk scripts to provide the image handling functions. . This package includes Tcl stub libraries and headers, which are necessary to develop C-based extensions using Img. Package: libtk-img-doc Section: doc Architecture: all Depends: ${misc:Depends} Suggests: libtk-img Conflicts: libtk-img (<< 1:1.3-release-6) Replaces: libtk-img (<< 1:1.3-release-6) Description: Extended image format support for Tcl/Tk (manual pages) Img is a package to enhance Tk by providing support for various image formats such as XPM, GIF (transparency supported, but not LZW), PNG, JPEG, TIFF, and PostScript. . The libimg library can be loaded dynamically into Tcl/Tk scripts to provide the image handling functions. . This package includes manual pages and examples. debian/libtk-img-doc.docs0000664000000000000000000000000712252771677012501 0ustar README debian/tkv.10000664000000000000000000000130310620702051010044 0ustar .TH TKV 1 "2001-06-14" .\" Please adjust this date whenever revising the manpage. .SH NAME tkv \- Tcl/Tk image viewer .SH SYNOPSIS .B tkv .RI [filename] .SH DESCRIPTION The .B tkv script is an image viewer written in Tcl/Tk and utilizing the Img library. It can be invoked with the optional filename of an image that will be displayed upon startup, or can simply be invoked by itself. .B tkv is intended primarily as a functioning demo/proof of concept of using the Img library. .SH OPTIONS There are no options to .B tkv . .SH SEE ALSO .BR image (3tk), .BR photo (3tk). .SH AUTHOR This manual page was written by Mike Markley for the Debian GNU/Linux system (but may be used by others). debian/rules0000775000000000000000000000750312254221033010247 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 pkgdir=$(shell pwd)/debian/tmp libdir=$(pkgdir)/usr/lib #CFLAGS = -Wall -g ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk LDFLAGS_DEFAULT = `dpkg-buildflags --get LDFLAGS` export LDFLAGS_DEFAULT LDFLAGS_OPTIMIZE = `dpkg-buildflags --get LDFLAGS` export LDFLAGS_OPTIMIZE clean: dh_testdir dh_testroot rm -f configure-stamp build-stamp # [ ! -f Makefile ] || $(MAKE) distclean rm -rf libtiff/tcl/port rm -rf libtiff/tcl/man rm -rf libtiff/tcl/libtiff rm -f libjpeg/jconfig.h rm -f libtiff/tcl/tools/Makefile find . -name "*.so" | xargs rm -f find . -name "*.a" | xargs rm -f find . -name config.status | xargs rm -f find . -name config.log | xargs rm -f dh_clean configure: configure-stamp configure-stamp: dh_testdir cp /usr/include/$(DEB_HOST_MULTIARCH)/jconfig.h libjpeg/ # CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-tcl=/usr/lib \ --with-tk=/usr/lib \ --with-tkinclude=/usr/include/tcl \ --enable-threads # touch configure-stamp build-arch: build-stamp build-indep: build-stamp build: build-stamp build-stamp: configure dh_testdir # $(MAKE) TCL_INC_DIR=/usr/include/tcl/tcl-private/generic \ TK_INC_DIR=/usr/include/tcl/tk-private/generic # touch build-stamp install: build-stamp dh_testdir dh_testroot dh_prep # $(MAKE) install INSTALL_ROOT=$(pkgdir) # # Fix file permissions find $(libdir) -type f | xargs chmod a-x # # Fix pkgIndex.tcl to prevent loading package to Tk 8.3 or older sed -i -e'1i\ # Tcl package index file\ #\ # Return if Tcl/Tk is old.\ #\ if {[package vcompare [info tclversion] 8.4] < 0} return\ ' $(libdir)/Img*/pkgIndex.tcl # # Move library into tcltk subdirectory install -m 755 -d $(libdir)/tcltk mv $(libdir)/Img* $(libdir)/tcltk # # Fix *Config.sh DIR=`ls -d $(libdir)/tcltk/Img*` ; \ PKGDIR=`basename $$DIR` ; \ for f in $(libdir)/*Config.sh ; do \ sed -i -e "s:/usr/lib/[0-9.a-z]*:/usr/lib/tcltk/$$PKGDIR:" $$f || exit 1; \ done # # Cleanup manpages (cd $(pkgdir)/usr/share/man/mann && \ for f in *.n ; do \ sed -e'/^\.so man.macros/ d' \ -e'/^\.BS/ d' \ -e'/^\.BE/ d' \ -e's/^\.TH \([^ ]\+\) n/.TH \1 3tk/' \ -e's/\xc2\xad //' \ $$f > `basename $$f .n`.3tk || exit 1; \ done) # Rename img to img-intro since it's refered as img-intro mv $(pkgdir)/usr/share/man/mann/img.3tk $(pkgdir)/usr/share/man/mann/img-intro.3tk binary-indep: build install dh_testdir dh_testroot dh_installdirs -i dh_install -i dh_installdocs -i dh_installexamples -i dh_installman -i dh_installchangelogs -i ChangeLog dh_lintian -i dh_link -i dh_strip -i dh_compress -i -X.tcl dh_fixperms -i chmod a-x debian/libtk-img-doc/usr/share/doc/libtk-img-doc/examples/msgs/* dh_makeshlibs -i dh_installdeb -i dh_shlibdeps -i tcltk-depends -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i binary-arch: build install dh_testdir dh_testroot dh_installdirs -a dh_install -a dh_installdocs -a dh_installexamples -a dh_installman -a dh_installchangelogs -a ChangeLog dh_lintian -a dh_link -a dh_strip -a dh_compress -a -X.tcl dh_fixperms -a dh_makeshlibs -a dh_installdeb -a dh_shlibdeps -a tcltk-depends -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch get-orig-source: # Can't use version number from debian/changelog because # this target should work from any directory wget -O libtk-img_1.4.2.orig.tar.gz \ http://prdownloads.sourceforge.net/tkimg/tkimg1.4.2.tar.gz .PHONY: configure build build-arch build-indep clean binary-indep \ binary-arch binary install get-orig-source debian/libtk-img-doc.manpages0000664000000000000000000000004412252771677013345 0ustar debian/tmp/usr/share/man/mann/*.3tk debian/watch0000664000000000000000000000025011155445366010230 0ustar # Watch control file for uscan # Compulsory line, this is a version 3 file version=3 opts=dversionmangle=s/-release$// \ http://sf.net/tkimg/tkimg([\d.]*).tar.gz debian/libtk-img-doc.links0000664000000000000000000000010212252771677012665 0ustar usr/share/man/man3/img.3tk.gz usr/share/man/man3/img-intro.3tk.gz debian/libtk-img.docs0000664000000000000000000000000711006164403011711 0ustar README debian/patches/0000775000000000000000000000000012253361520010616 5ustar debian/patches/window.diff0000664000000000000000000000063212252771677013001 0ustar Patch removes unnecessary libraries from linking to them. --- a/window/Makefile.in +++ b/window/Makefile.in @@ -172,7 +172,7 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -DPACKAGE_TCLNAME=\"$(PACKAGE_TCLNAME)\" -LIBS = @PKG_LIBS@ @LIBS@ @TK_LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ AR = @AR@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) debian/patches/libtiff.diff0000664000000000000000000003267512253361306013106 0ustar Author: Sergei Golovan Description: Patch allows one to build libtk-img using the system-wide libtiff. This patch adds a hack which sort of ports libtk-img to versio 4 of libtiff. The patch is a Debian-specific hack and isn't supposed to be forwarded upstream. Last-modified: Sun, 15 Dec 2013 21:03:21 +0400 --- a/libtiff/configure +++ b/libtiff/configure @@ -7345,59 +7345,6 @@ done - - - - vars=" - ../compat/libtiff/libtiff/tif_aux.c ../compat/libtiff/libtiff/tif_close.c ../compat/libtiff/libtiff/tif_codec.c - ../compat/libtiff/libtiff/tif_compress.c ../compat/libtiff/libtiff/tif_dir.c ../compat/libtiff/libtiff/tif_dirinfo.c - ../compat/libtiff/libtiff/tif_dirread.c ../compat/libtiff/libtiff/tif_dirwrite.c ../compat/libtiff/libtiff/tif_dumpmode.c - ../compat/libtiff/libtiff/tif_error.c ../compat/libtiff/libtiff/tif_fax3.c - ../compat/libtiff/libtiff/tif_getimage.c ../compat/libtiff/libtiff/tif_flush.c ../compat/libtiff/libtiff/tif_luv.c - ../compat/libtiff/libtiff/tif_lzw.c ../compat/libtiff/libtiff/tif_next.c ../compat/libtiff/libtiff/tif_open.c - ../compat/libtiff/libtiff/tif_packbits.c ../compat/libtiff/libtiff/tif_predict.c ../compat/libtiff/libtiff/tif_print.c - ../compat/libtiff/libtiff/tif_read.c ../compat/libtiff/libtiff/tif_swab.c ../compat/libtiff/libtiff/tif_strip.c - ../compat/libtiff/libtiff/tif_thunder.c ../compat/libtiff/libtiff/tif_tile.c ../compat/libtiff/libtiff/tif_version.c - ../compat/libtiff/libtiff/tif_warning.c ../compat/libtiff/libtiff/tif_write.c - ../compat/libtiff/libtiff/tif_color.c ../compat/libtiff/libtiff/tif_extension.c -" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="tifftcl.h tifftclDecls.h" for i in $vars; do # check for existence, be strict because it is installed --- a/libtiff/configure.in +++ b/libtiff/configure.in @@ -82,20 +82,6 @@ TEA_ADD_SOURCES([tifftcl.c tifftclStubInit.c]) -TEA_ADD_SOURCES([ - ../compat/libtiff/libtiff/tif_aux.c ../compat/libtiff/libtiff/tif_close.c ../compat/libtiff/libtiff/tif_codec.c - ../compat/libtiff/libtiff/tif_compress.c ../compat/libtiff/libtiff/tif_dir.c ../compat/libtiff/libtiff/tif_dirinfo.c - ../compat/libtiff/libtiff/tif_dirread.c ../compat/libtiff/libtiff/tif_dirwrite.c ../compat/libtiff/libtiff/tif_dumpmode.c - ../compat/libtiff/libtiff/tif_error.c ../compat/libtiff/libtiff/tif_fax3.c - ../compat/libtiff/libtiff/tif_getimage.c ../compat/libtiff/libtiff/tif_flush.c ../compat/libtiff/libtiff/tif_luv.c - ../compat/libtiff/libtiff/tif_lzw.c ../compat/libtiff/libtiff/tif_next.c ../compat/libtiff/libtiff/tif_open.c - ../compat/libtiff/libtiff/tif_packbits.c ../compat/libtiff/libtiff/tif_predict.c ../compat/libtiff/libtiff/tif_print.c - ../compat/libtiff/libtiff/tif_read.c ../compat/libtiff/libtiff/tif_swab.c ../compat/libtiff/libtiff/tif_strip.c - ../compat/libtiff/libtiff/tif_thunder.c ../compat/libtiff/libtiff/tif_tile.c ../compat/libtiff/libtiff/tif_version.c - ../compat/libtiff/libtiff/tif_warning.c ../compat/libtiff/libtiff/tif_write.c - ../compat/libtiff/libtiff/tif_color.c ../compat/libtiff/libtiff/tif_extension.c -]) - TEA_ADD_HEADERS([tifftcl.h tifftclDecls.h]) TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"]) TEA_ADD_INCLUDES([-I\"./libtiff\"]) --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -153,9 +153,9 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ -ltiff AR = @AR@ -CFLAGS = @CFLAGS@ -DTIFFTCLAPI=MODULE_SCOPE -DLOGLUV_PUBLIC=0 +CFLAGS = @CFLAGS@ -DTIFFTCLAPI=MODULE_SCOPE -DLOGLUV_PUBLIC=0 -DMODULE_SCOPE=extern COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) #======================================================================== --- a/libtiff/tifftcl.decls +++ b/libtiff/tifftcl.decls @@ -172,9 +172,6 @@ declare 49 { int TIFFWriteDirectory(TIFF *tiffptr) } -declare 50 { - int TIFFReassignTagToIgnore(enum TIFFIgnoreSense a, int b) -} declare 51 { void TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b) } @@ -311,6 +308,9 @@ declare 93 { const unsigned char *TIFFGetBitRevTable(int a) } +declare 94 { + void TIFFMergeFieldInfo(TIFF *tiffptr, const TIFFFieldInfo *a, int b) +} # Source: tif_predict.h ... declare 100 { @@ -318,24 +318,12 @@ } # Source: tif_dir.h ... -declare 110 { - void _TIFFSetupFieldInfo(TIFF *tiffptr, const TIFFFieldInfo a[], size_t b) -} -declare 111 { - int _TIFFMergeFieldInfo(TIFF *tiffptr, const TIFFFieldInfo *a, int b) -} declare 112 { void _TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a) } -declare 113 { - const TIFFFieldInfo *TIFFFindFieldInfo(TIFF *tiffptr, ttag_t a, TIFFDataType b) -} declare 114 { const TIFFFieldInfo *TIFFFieldWithTag(TIFF *tiffptr, ttag_t a) } -declare 115 { - TIFFDataType _TIFFSampleToTagType(TIFF *tiffptr) -} # Source: tiffiop.h ... --- a/libtiff/tifftclDecls.h +++ b/libtiff/tifftclDecls.h @@ -150,9 +150,7 @@ TIFFTCLAPI int TIFFVSetField(TIFF *tiffptr, ttag_t a, va_list b); /* 49 */ TIFFTCLAPI int TIFFWriteDirectory(TIFF *tiffptr); -/* 50 */ -TIFFTCLAPI int TIFFReassignTagToIgnore(enum TIFFIgnoreSense a, - int b); +/* Slot 50 is reserved */ /* 51 */ TIFFTCLAPI void TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b); /* 52 */ @@ -263,7 +261,9 @@ TIFFTCLAPI void TIFFReverseBits(unsigned char *a, unsigned long b); /* 93 */ TIFFTCLAPI const unsigned char * TIFFGetBitRevTable(int a); -/* Slot 94 is reserved */ +/* 94 */ +TIFFTCLAPI void TIFFMergeFieldInfo(TIFF *tiffptr, + const TIFFFieldInfo *a, int b); /* Slot 95 is reserved */ /* Slot 96 is reserved */ /* Slot 97 is reserved */ @@ -280,21 +280,14 @@ /* Slot 107 is reserved */ /* Slot 108 is reserved */ /* Slot 109 is reserved */ -/* 110 */ -TIFFTCLAPI void _TIFFSetupFieldInfo(TIFF *tiffptr, - const TIFFFieldInfo a[], size_t b); -/* 111 */ -TIFFTCLAPI int _TIFFMergeFieldInfo(TIFF *tiffptr, - const TIFFFieldInfo *a, int b); +/* Slot 110 is reserved */ +/* Slot 111 is reserved */ /* 112 */ TIFFTCLAPI void _TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a); -/* 113 */ -TIFFTCLAPI const TIFFFieldInfo * TIFFFindFieldInfo(TIFF *tiffptr, ttag_t a, - TIFFDataType b); +/* Slot 113 is reserved */ /* 114 */ TIFFTCLAPI const TIFFFieldInfo * TIFFFieldWithTag(TIFF *tiffptr, ttag_t a); -/* 115 */ -TIFFTCLAPI TIFFDataType _TIFFSampleToTagType(TIFF *tiffptr); +/* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ /* Slot 118 is reserved */ @@ -452,7 +445,7 @@ int (*tIFFSetField) (TIFF *tiffptr, ttag_t a, ...); /* 47 */ int (*tIFFVSetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 48 */ int (*tIFFWriteDirectory) (TIFF *tiffptr); /* 49 */ - int (*tIFFReassignTagToIgnore) (enum TIFFIgnoreSense a, int b); /* 50 */ + void (*reserved50)(void); void (*tIFFPrintDirectory) (TIFF *tiffptr, FILE *a, long b); /* 51 */ int (*tIFFReadScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 52 */ int (*tIFFWriteScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 53 */ @@ -496,7 +489,7 @@ void (*tIFFSwabArrayOfDouble) (double *a, unsigned long b); /* 91 */ void (*tIFFReverseBits) (unsigned char *a, unsigned long b); /* 92 */ const unsigned char * (*tIFFGetBitRevTable) (int a); /* 93 */ - void (*reserved94)(void); + void (*tIFFMergeFieldInfo) (TIFF *tiffptr, const TIFFFieldInfo *a, int b); /* 94 */ void (*reserved95)(void); void (*reserved96)(void); void (*reserved97)(void); @@ -512,12 +505,12 @@ void (*reserved107)(void); void (*reserved108)(void); void (*reserved109)(void); - void (*_TIFFSetupFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo a[], size_t b); /* 110 */ - int (*_TIFFMergeFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo *a, int b); /* 111 */ + void (*reserved110)(void); + void (*reserved111)(void); void (*_TIFFPrintFieldInfoPtr) (TIFF *tiffptr, FILE *a); /* 112 */ - const TIFFFieldInfo * (*tIFFFindFieldInfo) (TIFF *tiffptr, ttag_t a, TIFFDataType b); /* 113 */ + void (*reserved113)(void); const TIFFFieldInfo * (*tIFFFieldWithTag) (TIFF *tiffptr, ttag_t a); /* 114 */ - TIFFDataType (*_TIFFSampleToTagTypePtr) (TIFF *tiffptr); /* 115 */ + void (*reserved115)(void); void (*reserved116)(void); void (*reserved117)(void); void (*reserved118)(void); @@ -681,8 +674,7 @@ (tifftclStubsPtr->tIFFVSetField) /* 48 */ #define TIFFWriteDirectory \ (tifftclStubsPtr->tIFFWriteDirectory) /* 49 */ -#define TIFFReassignTagToIgnore \ - (tifftclStubsPtr->tIFFReassignTagToIgnore) /* 50 */ +/* Slot 50 is reserved */ #define TIFFPrintDirectory \ (tifftclStubsPtr->tIFFPrintDirectory) /* 51 */ #define TIFFReadScanline \ @@ -769,7 +761,8 @@ (tifftclStubsPtr->tIFFReverseBits) /* 92 */ #define TIFFGetBitRevTable \ (tifftclStubsPtr->tIFFGetBitRevTable) /* 93 */ -/* Slot 94 is reserved */ +#define TIFFMergeFieldInfo \ + (tifftclStubsPtr->tIFFMergeFieldInfo) /* 94 */ /* Slot 95 is reserved */ /* Slot 96 is reserved */ /* Slot 97 is reserved */ @@ -786,18 +779,14 @@ /* Slot 107 is reserved */ /* Slot 108 is reserved */ /* Slot 109 is reserved */ -#define _TIFFSetupFieldInfo \ - (tifftclStubsPtr->_TIFFSetupFieldInfoPtr) /* 110 */ -#define _TIFFMergeFieldInfo \ - (tifftclStubsPtr->_TIFFMergeFieldInfoPtr) /* 111 */ +/* Slot 110 is reserved */ +/* Slot 111 is reserved */ #define _TIFFPrintFieldInfo \ (tifftclStubsPtr->_TIFFPrintFieldInfoPtr) /* 112 */ -#define TIFFFindFieldInfo \ - (tifftclStubsPtr->tIFFFindFieldInfo) /* 113 */ +/* Slot 113 is reserved */ #define TIFFFieldWithTag \ (tifftclStubsPtr->tIFFFieldWithTag) /* 114 */ -#define _TIFFSampleToTagType \ - (tifftclStubsPtr->_TIFFSampleToTagTypePtr) /* 115 */ +/* Slot 115 is reserved */ /* Slot 116 is reserved */ /* Slot 117 is reserved */ /* Slot 118 is reserved */ --- a/libtiff/tifftclStubInit.c +++ b/libtiff/tifftclStubInit.c @@ -70,7 +70,7 @@ TIFFSetField, /* 47 */ TIFFVSetField, /* 48 */ TIFFWriteDirectory, /* 49 */ - TIFFReassignTagToIgnore, /* 50 */ + 0, /* 50 */ TIFFPrintDirectory, /* 51 */ TIFFReadScanline, /* 52 */ TIFFWriteScanline, /* 53 */ @@ -114,7 +114,7 @@ TIFFSwabArrayOfDouble, /* 91 */ TIFFReverseBits, /* 92 */ TIFFGetBitRevTable, /* 93 */ - 0, /* 94 */ + TIFFMergeFieldInfo, /* 94 */ 0, /* 95 */ 0, /* 96 */ 0, /* 97 */ @@ -130,12 +130,12 @@ 0, /* 107 */ 0, /* 108 */ 0, /* 109 */ - _TIFFSetupFieldInfo, /* 110 */ - _TIFFMergeFieldInfo, /* 111 */ + 0, /* 110 */ + 0, /* 111 */ _TIFFPrintFieldInfo, /* 112 */ - TIFFFindFieldInfo, /* 113 */ + 0, /* 113 */ TIFFFieldWithTag, /* 114 */ - _TIFFSampleToTagType, /* 115 */ + 0, /* 115 */ 0, /* 116 */ 0, /* 117 */ 0, /* 118 */ --- a/tiff/tiff.c +++ b/tiff/tiff.c @@ -117,7 +117,7 @@ initialized = 1; if ( TIFFRegisterCODEC && TIFFError && TIFFPredictorInit && - _TIFFMergeFieldInfo && TIFFFlushData1 && _TIFFNoPostDecode && + TIFFMergeFieldInfo && TIFFFlushData1 && _TIFFNoPostDecode && TIFFTileRowSize && TIFFScanlineSize && _TIFFsetByteArray && TIFFVSetField && TIFFSwabArrayOfShort ) { --- a/tiff/tiffJpeg.c +++ b/tiff/tiffJpeg.c @@ -1599,7 +1599,7 @@ * Merge codec-specific tag information and * override parent get/set field methods. */ - _TIFFMergeFieldInfo(tif, jpegFieldInfo, N(jpegFieldInfo)); + TIFFMergeFieldInfo(tif, jpegFieldInfo, N(jpegFieldInfo)); sp->vgetparent = tif->tif_tagmethods.vgetfield; tif->tif_tagmethods.vgetfield = JPEGVGetField; /* hook for codec tags */ sp->vsetparent = tif->tif_tagmethods.vsetfield; --- a/tiff/tiffPixar.c +++ b/tiff/tiffPixar.c @@ -1354,7 +1354,7 @@ tif->tif_cleanup = PixarLogCleanup; /* Override SetField so we can handle our private pseudo-tag */ - _TIFFMergeFieldInfo(tif, pixarlogFieldInfo, N(pixarlogFieldInfo)); + TIFFMergeFieldInfo(tif, pixarlogFieldInfo, N(pixarlogFieldInfo)); sp->vgetparent = tif->tif_tagmethods.vgetfield; tif->tif_tagmethods.vgetfield = PixarLogVGetField; /* hook for codec tags */ sp->vsetparent = tif->tif_tagmethods.vsetfield; --- a/tiff/tiffZip.c +++ b/tiff/tiffZip.c @@ -370,7 +370,7 @@ * override parent get/set field methods. */ - _TIFFMergeFieldInfo(tif, (const void *) zipFieldInfo, N(zipFieldInfo)); + TIFFMergeFieldInfo(tif, (const void *) zipFieldInfo, N(zipFieldInfo)); sp->vgetparent = tif->tif_tagmethods.vgetfield; tif->tif_tagmethods.vgetfield = ZIPVGetField; /* hook for codec tags */ sp->vsetparent = tif->tif_tagmethods.vsetfield; debian/patches/pixmap.diff0000664000000000000000000000063212252771677012770 0ustar Patch removes unnecessary libraries from linking to them. --- a/pixmap/Makefile.in +++ b/pixmap/Makefile.in @@ -169,7 +169,7 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -DPACKAGE_TCLNAME=\"$(PACKAGE_TCLNAME)\" -LIBS = @PKG_LIBS@ @LIBS@ @TK_LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ AR = @AR@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) debian/patches/libz.diff0000664000000000000000000001632612252771677012441 0ustar Patch enable dynamic linking to system-wide zlib. --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -151,9 +151,9 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ -lz AR = @AR@ -CFLAGS = @CFLAGS@ -DZEXTERN=MODULE_SCOPE -DZLIB_CONST +CFLAGS = @CFLAGS@ -DZEXTERN=MODULE_SCOPE -DZLIB_CONST -DMODULE_SCOPE=extern COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) #======================================================================== --- a/zlib/configure +++ b/zlib/configure @@ -7148,194 +7148,6 @@ done - - - vars="../compat/zlib/adler32.c ../compat/zlib/compress.c ../compat/zlib/crc32.c" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="../compat/zlib/deflate.c ../compat/zlib/gzclose.c ../compat/zlib/gzlib.c" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="../compat/zlib/gzread.c ../compat/zlib/gzwrite.c ../compat/zlib/infback.c" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="../compat/zlib/inffast.c ../compat/zlib/inflate.c ../compat/zlib/inftrees.c" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="../compat/zlib/trees.c ../compat/zlib/uncompr.c ../compat/zlib/zutil.c" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="zlibtcl.h zlibtclDecls.h" for i in $vars; do # check for existence, be strict because it is installed --- a/zlib/configure.in +++ b/zlib/configure.in @@ -51,11 +51,6 @@ #----------------------------------------------------------------------- TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c]) -TEA_ADD_SOURCES([../compat/zlib/adler32.c ../compat/zlib/compress.c ../compat/zlib/crc32.c]) -TEA_ADD_SOURCES([../compat/zlib/deflate.c ../compat/zlib/gzclose.c ../compat/zlib/gzlib.c]) -TEA_ADD_SOURCES([../compat/zlib/gzread.c ../compat/zlib/gzwrite.c ../compat/zlib/infback.c]) -TEA_ADD_SOURCES([../compat/zlib/inffast.c ../compat/zlib/inflate.c ../compat/zlib/inftrees.c]) -TEA_ADD_SOURCES([../compat/zlib/trees.c ../compat/zlib/uncompr.c ../compat/zlib/zutil.c]) TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h]) --- a/zlib/zlibtclDecls.h +++ b/zlib/zlibtclDecls.h @@ -28,7 +28,7 @@ EXTERN int Zlibtcl_Init(Tcl_Interp *interp); EXTERN int Zlibtcl_SafeInit(Tcl_Interp *interp); -#include "../compat/zlib/zlib.h" +#include "/usr/include/zlib.h" #undef gzgetc /* Became a macro in zlib 1.2.7 */ debian/patches/libjpeg.diff0000664000000000000000000001156612252771677013116 0ustar Patch enable dynamic linking to system-wide libjpeg. --- a/libjpeg/Makefile.in +++ b/libjpeg/Makefile.in @@ -151,9 +151,9 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ -ljpeg AR = @AR@ -CFLAGS = @CFLAGS@ -DJPEGTCLAPI=MODULE_SCOPE -I$(srcdir)/../base +CFLAGS = @CFLAGS@ -DJPEGTCLAPI=MODULE_SCOPE -I$(srcdir)/../base -DMODULE_SCOPE=extern COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) #======================================================================== --- a/libjpeg/configure +++ b/libjpeg/configure @@ -7153,59 +7153,6 @@ - vars=" - ../compat/libjpeg/jcapimin.c ../compat/libjpeg/jcapistd.c ../compat/libjpeg/jccoefct.c - ../compat/libjpeg/jccolor.c ../compat/libjpeg/jcdctmgr.c ../compat/libjpeg/jchuff.c - ../compat/libjpeg/jcinit.c ../compat/libjpeg/jcmainct.c ../compat/libjpeg/jcmarker.c - ../compat/libjpeg/jcmaster.c ../compat/libjpeg/jcomapi.c ../compat/libjpeg/jcparam.c - ../compat/libjpeg/jcarith.c ../compat/libjpeg/jcprepct.c ../compat/libjpeg/jcsample.c - ../compat/libjpeg/jctrans.c ../compat/libjpeg/jdapimin.c ../compat/libjpeg/jdapistd.c - ../compat/libjpeg/jdatadst.c ../compat/libjpeg/jdatasrc.c ../compat/libjpeg/jdcoefct.c - ../compat/libjpeg/jdcolor.c ../compat/libjpeg/jddctmgr.c ../compat/libjpeg/jdhuff.c - ../compat/libjpeg/jdinput.c ../compat/libjpeg/jdmainct.c ../compat/libjpeg/jdmarker.c - ../compat/libjpeg/jdmaster.c ../compat/libjpeg/jdmerge.c ../compat/libjpeg/jdarith.c - ../compat/libjpeg/jdpostct.c ../compat/libjpeg/jdsample.c ../compat/libjpeg/jdtrans.c - ../compat/libjpeg/jerror.c ../compat/libjpeg/jfdctflt.c ../compat/libjpeg/jfdctfst.c - ../compat/libjpeg/jfdctint.c ../compat/libjpeg/jidctflt.c ../compat/libjpeg/jidctfst.c - ../compat/libjpeg/jidctint.c ../compat/libjpeg/jaricom.c ../compat/libjpeg/jquant1.c - ../compat/libjpeg/jquant2.c ../compat/libjpeg/jutils.c ../compat/libjpeg/jmemmgr.c - ../compat/libjpeg/jmemansi.c -" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - vars="jpegtcl.h jpegtclDecls.h" --- a/libjpeg/configure.in +++ b/libjpeg/configure.in @@ -54,24 +54,6 @@ TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c]) -TEA_ADD_SOURCES([ - ../compat/libjpeg/jcapimin.c ../compat/libjpeg/jcapistd.c ../compat/libjpeg/jccoefct.c - ../compat/libjpeg/jccolor.c ../compat/libjpeg/jcdctmgr.c ../compat/libjpeg/jchuff.c - ../compat/libjpeg/jcinit.c ../compat/libjpeg/jcmainct.c ../compat/libjpeg/jcmarker.c - ../compat/libjpeg/jcmaster.c ../compat/libjpeg/jcomapi.c ../compat/libjpeg/jcparam.c - ../compat/libjpeg/jcarith.c ../compat/libjpeg/jcprepct.c ../compat/libjpeg/jcsample.c - ../compat/libjpeg/jctrans.c ../compat/libjpeg/jdapimin.c ../compat/libjpeg/jdapistd.c - ../compat/libjpeg/jdatadst.c ../compat/libjpeg/jdatasrc.c ../compat/libjpeg/jdcoefct.c - ../compat/libjpeg/jdcolor.c ../compat/libjpeg/jddctmgr.c ../compat/libjpeg/jdhuff.c - ../compat/libjpeg/jdinput.c ../compat/libjpeg/jdmainct.c ../compat/libjpeg/jdmarker.c - ../compat/libjpeg/jdmaster.c ../compat/libjpeg/jdmerge.c ../compat/libjpeg/jdarith.c - ../compat/libjpeg/jdpostct.c ../compat/libjpeg/jdsample.c ../compat/libjpeg/jdtrans.c - ../compat/libjpeg/jerror.c ../compat/libjpeg/jfdctflt.c ../compat/libjpeg/jfdctfst.c - ../compat/libjpeg/jfdctint.c ../compat/libjpeg/jidctflt.c ../compat/libjpeg/jidctfst.c - ../compat/libjpeg/jidctint.c ../compat/libjpeg/jaricom.c ../compat/libjpeg/jquant1.c - ../compat/libjpeg/jquant2.c ../compat/libjpeg/jutils.c ../compat/libjpeg/jmemmgr.c - ../compat/libjpeg/jmemansi.c -]) TEA_ADD_HEADERS([jpegtcl.h jpegtclDecls.h]) --- a/libjpeg/jpegtclDecls.h +++ b/libjpeg/jpegtclDecls.h @@ -30,8 +30,8 @@ /* undef Tcl macros that conflict with libjpeg stuff (sigh) */ #undef EXTERN -#include "../compat/libjpeg/jpeglib.h" -#include "../compat/libjpeg/jerror.h" +#include "/usr/include/jpeglib.h" +#include "/usr/include/jerror.h" /* !BEGIN!: Do not edit below this line. */ debian/patches/libpng.diff0000664000000000000000000001672412253311151012730 0ustar Author: Sergei Golovan Description: Patch allows one to build libtk-img using the system-wide libpng. Also, it relaxes the libpng versio requirement (to 1.2). The patch is a Debian-specific hack and isn't supposed to be forwarded upstream. Last-modified: Sun, 15 Dec 2013 15:27:31 +0400 --- a/libpng/configure +++ b/libpng/configure @@ -7433,53 +7433,6 @@ done - - - - vars=" - ../compat/libpng/png.c ../compat/libpng/pngerror.c ../compat/libpng/pngmem.c - ../compat/libpng/pngpread.c ../compat/libpng/pngread.c ../compat/libpng/pngrio.c - ../compat/libpng/pngrtran.c ../compat/libpng/pngrutil.c ../compat/libpng/pngset.c - ../compat/libpng/pngtrans.c ../compat/libpng/pngwio.c ../compat/libpng/pngwrite.c - ../compat/libpng/pngwtran.c ../compat/libpng/pngwutil.c ../compat/libpng/pngget.c -" - for i in $vars; do - case $i in - \$*) - # allow $-var names - PKG_SOURCES="$PKG_SOURCES $i" - PKG_OBJECTS="$PKG_OBJECTS $i" - ;; - *) - # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - -a ! -f "${srcdir}/macosx/$i" \ - ; then - { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 -echo "$as_me: error: could not find source file '$i'" >&2;} - { (exit 1); exit 1; }; } - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir - i=`basename $i` - # handle user calling this before or after TEA_SETUP_COMPILER - if test x"${OBJEXT}" != x ; then - j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" - else - j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" - fi - PKG_OBJECTS="$PKG_OBJECTS $j" - ;; - esac - done - - - - - vars="pngtcl.h pngtclDecls.h" for i in $vars; do # check for existence, be strict because it is installed --- a/libpng/configure.in +++ b/libpng/configure.in @@ -65,14 +65,6 @@ TEA_ADD_SOURCES([pngtcl.c pngtclStubInit.c]) -TEA_ADD_SOURCES([ - ../compat/libpng/png.c ../compat/libpng/pngerror.c ../compat/libpng/pngmem.c - ../compat/libpng/pngpread.c ../compat/libpng/pngread.c ../compat/libpng/pngrio.c - ../compat/libpng/pngrtran.c ../compat/libpng/pngrutil.c ../compat/libpng/pngset.c - ../compat/libpng/pngtrans.c ../compat/libpng/pngwio.c ../compat/libpng/pngwrite.c - ../compat/libpng/pngwtran.c ../compat/libpng/pngwutil.c ../compat/libpng/pngget.c -]) - TEA_ADD_HEADERS([pngtcl.h pngtclDecls.h]) TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_SRC_PATH}`\"]) TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_BUILD_PATH}`\"]) --- a/libpng/Makefile.in +++ b/libpng/Makefile.in @@ -155,9 +155,9 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ +LIBS = @PKG_LIBS@ @LIBS@ -lpng12 AR = @AR@ -CFLAGS = @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE +CFLAGS = @CFLAGS@ -DPNG_IMPEXP= -DPNG_EXTERN=MODULE_SCOPE -DMODULE_SCOPE=extern COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) #======================================================================== --- a/libpng/pngtcl.decls +++ b/libpng/pngtcl.decls @@ -38,10 +38,10 @@ png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn) } declare 6 { - png_size_t png_get_compression_buffer_size(png_const_structp png_ptr) + png_uint_32 png_get_compression_buffer_size(png_const_structp png_ptr) } declare 7 { - void png_set_compression_buffer_size(png_structp png_ptr, png_size_t size) + void png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size) } declare 8 { int png_reset_zstream(png_structp png_ptr) @@ -345,7 +345,7 @@ png_uint_32 png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag) } declare 108 { - png_size_t png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr) + png_uint_32 png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr) } declare 109 generic {!PNG_INFO_IMAGE_SUPPORTED} { png_bytepp png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr) --- a/libpng/pngtclDecls.h +++ b/libpng/pngtclDecls.h @@ -28,7 +28,14 @@ EXTERN int Pngtcl_Init(Tcl_Interp *interp); EXTERN int Pngtcl_SafeInit(Tcl_Interp *interp); -#include "../compat/libpng/png.h" +#undef PNG_IMPEXP +#include "/usr/include/png.h" +#define PNG_IMPEXP extern + +#define png_const_structp png_structp +#define png_const_infop png_infop +#define png_alloc_size_t png_uint_32 +#define png_set_quantize png_set_dither /* !BEGIN!: Do not edit below this line. */ @@ -53,11 +60,11 @@ png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn); /* 6 */ -PNG_IMPEXP png_size_t png_get_compression_buffer_size( +PNG_IMPEXP png_uint_32 png_get_compression_buffer_size( png_const_structp png_ptr); /* 7 */ PNG_IMPEXP void png_set_compression_buffer_size(png_structp png_ptr, - png_size_t size); + png_uint_32 size); /* 8 */ PNG_IMPEXP int png_reset_zstream(png_structp png_ptr); /* 9 */ @@ -341,7 +348,7 @@ PNG_IMPEXP png_uint_32 png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag); /* 108 */ -PNG_IMPEXP png_size_t png_get_rowbytes(png_const_structp png_ptr, +PNG_IMPEXP png_uint_32 png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr); /* 109 */ PNG_IMPEXP png_bytepp png_get_rows(png_const_structp png_ptr, @@ -1031,8 +1038,8 @@ void (*reserved3)(void); png_structp (*png_create_read_structPtr) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn); /* 4 */ png_structp (*png_create_write_structPtr) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn); /* 5 */ - png_size_t (*png_get_compression_buffer_sizePtr) (png_const_structp png_ptr); /* 6 */ - void (*png_set_compression_buffer_sizePtr) (png_structp png_ptr, png_size_t size); /* 7 */ + png_uint_32 (*png_get_compression_buffer_sizePtr) (png_const_structp png_ptr); /* 6 */ + void (*png_set_compression_buffer_sizePtr) (png_structp png_ptr, png_uint_32 size); /* 7 */ int (*png_reset_zstreamPtr) (png_structp png_ptr); /* 8 */ png_structp (*png_create_read_struct_2Ptr) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn); /* 9 */ png_structp (*png_create_write_struct_2Ptr) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn); /* 10 */ @@ -1133,7 +1140,7 @@ void (*png_warningPtr) (png_structp png_ptr, png_const_charp message); /* 105 */ void (*png_chunk_warningPtr) (png_structp png_ptr, png_const_charp message); /* 106 */ png_uint_32 (*png_get_validPtr) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag); /* 107 */ - png_size_t (*png_get_rowbytesPtr) (png_const_structp png_ptr, png_const_infop info_ptr); /* 108 */ + png_uint_32 (*png_get_rowbytesPtr) (png_const_structp png_ptr, png_const_infop info_ptr); /* 108 */ png_bytepp (*png_get_rowsPtr) (png_const_structp png_ptr, png_const_infop info_ptr); /* 109 */ void (*png_set_rowsPtr) (png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers); /* 110 */ png_byte (*png_get_channelsPtr) (png_const_structp png_ptr, png_const_infop info_ptr); /* 111 */ debian/patches/series0000664000000000000000000000011012253361306012025 0ustar libz.diff libjpeg.diff libpng.diff libtiff.diff pixmap.diff window.diff debian/libtk-img.dirs0000664000000000000000000000004411673650412011735 0ustar usr/lib usr/share/lintian/overrides debian/compat0000664000000000000000000000000212252771677010406 0ustar 8 debian/libtk-img.install0000664000000000000000000000010711006164403012430 0ustar debian/tmp/usr/lib/tcltk/Img*/*.so debian/tmp/usr/lib/tcltk/Img*/*.tcl debian/libtk-img-dev.install0000664000000000000000000000012310720074320013202 0ustar debian/tmp/usr/include/* debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/tcltk/Img*/*.a debian/TODO0000664000000000000000000000007510627253704007670 0ustar * Write a standalone manpage or extend and divert photo(3tk) debian/libtk-img-doc.examples0000664000000000000000000000002612252771677013370 0ustar demo.tcl tkv.tcl msgs debian/libtk-img.lintian-overrides0000664000000000000000000000015412253361535014434 0ustar # override the false positive libtk-img: embedded-library usr/lib/tcltk/Img1.4.2/libtkimgtiff1.4.2.so: tiff