--- python-reportlab-2.4.orig/setup.py +++ python-reportlab-2.4/setup.py @@ -307,6 +307,7 @@ infoline( '#Attempting install of _renderPM') infoline( '#extensions from %r'%RENDERPM) LIBART_DIR=pjoin(RENDERPM,'libart_lgpl') + LIBART_DIR='/usr/include/libart-2.0' GT1_DIR=pjoin(RENDERPM,'gt1') MACROS=[('ROBIN_DEBUG',None)] MACROS=[] @@ -319,31 +320,22 @@ D[l[0].strip()] = l[1].strip() if len(D)==3: break return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % '.'.join(map(lambda k,D=D: D.get(k,'?'),K)) - LIBART_VERSION = libart_version() + def installed_libart_version(): + import string + fn = '/usr/include/libart-2.0/libart_lgpl/libart-features.h' + for l in open(fn, 'r').readlines(): + if l.startswith('#define LIBART_VERSION'): + v = string.split(l[:-1], ' ')[-1] + return v + return '"0.0.0"' + LIBART_VERSION = installed_libart_version() SOURCES=[pjoin(RENDERPM,'_renderPM.c'), - pjoin(LIBART_DIR,'art_vpath_bpath.c'), - pjoin(LIBART_DIR,'art_rgb_pixbuf_affine.c'), - pjoin(LIBART_DIR,'art_rgb_svp.c'), - pjoin(LIBART_DIR,'art_svp.c'), - pjoin(LIBART_DIR,'art_svp_vpath.c'), - pjoin(LIBART_DIR,'art_svp_vpath_stroke.c'), - pjoin(LIBART_DIR,'art_svp_ops.c'), - pjoin(LIBART_DIR,'art_vpath.c'), - pjoin(LIBART_DIR,'art_vpath_dash.c'), - pjoin(LIBART_DIR,'art_affine.c'), - pjoin(LIBART_DIR,'art_rect.c'), - pjoin(LIBART_DIR,'art_rgb_affine.c'), - pjoin(LIBART_DIR,'art_rgb_affine_private.c'), - pjoin(LIBART_DIR,'art_rgb.c'), - pjoin(LIBART_DIR,'art_rgb_rgba_affine.c'), - pjoin(LIBART_DIR,'art_svp_intersect.c'), - pjoin(LIBART_DIR,'art_svp_render_aa.c'), - pjoin(LIBART_DIR,'art_misc.c'), pjoin(GT1_DIR,'gt1-parset1.c'), pjoin(GT1_DIR,'gt1-dict.c'), pjoin(GT1_DIR,'gt1-namecontext.c'), pjoin(GT1_DIR,'gt1-region.c'), ] + LIBART_LIB = ['art_lgpl_2'] if platform=='win32': FT_LIB=config('FREETYPE','lib','') @@ -366,6 +358,8 @@ else: FT_LIB_DIR=config('FREETYPE','libdir') FT_INC_DIR=config('FREETYPE','incdir') + FT_LIB_DIR = [] + FT_INC_DIR = ['/usr/include/freetype2'] I,L=inc_lib_dirs() ftv = None for d in I: @@ -402,7 +396,7 @@ library_dirs=[]+FT_LIB_DIR, # libraries to link against - libraries=FT_LIB, + libraries=LIBART_LIB + FT_LIB, #extra_objects=['gt1.lib','libart.lib',], #extra_compile_args=['/Z7'], extra_link_args=[] --- python-reportlab-2.4.orig/debian/rules +++ python-reportlab-2.4/debian/rules @@ -0,0 +1,150 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# all versions +PYVERS := $(shell pyversions -vs) +VER := $(shell /usr/bin/python -c 'import sys; print sys.version[:3]') + +PY_INTERPRETER = /usr/bin/python + +include /usr/share/python/python.mk + +build: build-stamp +build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=dbg-build-python%) + touch $@ +build-python%: + python$* setup.py build +dbg-build-python%: + python$*-dbg setup.py build + touch $@ + +# needs installed python-imaging, python-renderpm, ttf-dustin +gendocs: + cd docs \ + && PYTHONPATH=$(CURDIR) python genAll.py + +clean: + dh_testdir + dh_testroot + rm -f *-stamp build-python* dbg-build-python* + rm -rf compile build debian/tmp-dbg + find -name '*.py[co]' -exec rm -f {} \; + rm -rf *.log *.pdf # test runs ... + dh_clean + +install: build-stamp install-prereq $(PYVERS:%=install-python%) $(PYVERS:%=install-dbg-python%) + +install-prereq: build-stamp + dh_testdir + dh_testroot + dh_clean -k + +install-python%: install-prereq + python$* setup.py install --root $(CURDIR)/debian/python-reportlab --install-layout=deb + find debian/python-reportlab -name '*.ttf' | xargs -r rm -f + find debian/python-reportlab -name '*.py[co]' | xargs -r rm -f + + mkdir -p debian/python-renderpm/$(call py_libdir,$*) + mv debian/python-reportlab/$(call py_libdir,$*)/_renderPM.so \ + debian/python-renderpm/$(call py_libdir,$*)/ + + mkdir -p debian/python-reportlab-accel/$(call py_libdir,$*) + mv debian/python-reportlab/$(call py_libdir,$*)/*.so \ + debian/python-reportlab-accel/$(call py_libdir,$*)/ + + install -d debian/python-reportlab-doc/usr/share/doc/python-reportlab + + : # remove test, docs and demo files + rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/demos + rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/tools/pythonpoint/demos + rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/docs + rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/test + rm -rf debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/fonts + + rm -f debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/README.txt + rm -f debian/python-reportlab/usr/lib/python$*/*-packages/reportlab/CHANGES.txt + +# -find debian -name '*.so' | xargs rm -f + + : # Replace all '#!' calls to python with $(PY_INTERPRETER) + : # and make them executable + for i in `find debian/python-reportlab -type f`; do \ + sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done + +install-dbg-python%: install-prereq + python$*-dbg setup.py install --root $(CURDIR)/debian/python-reportlab-accel-dbg --install-layout=deb + find debian/python-reportlab-accel-dbg ! -type d ! -name '*_d.so' | xargs rm -f + find debian/python-reportlab-accel-dbg -depth -empty -exec rmdir {} \; + mkdir -p debian/python-renderpm-dbg/$(call py_libdir,$*) + mv debian/python-reportlab-accel-dbg/$(call py_libdir,$*)/_renderPM_d.so \ + debian/python-renderpm-dbg/$(call py_libdir,$*)/ + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs -i README.txt +# dh_installdocs -ppython-reportlab-doc docs/*.pdf + dh_installexamples -ppython-reportlab-doc demos/* + rm -rf debian/python-reportlab-doc/usr/share/doc/python-reportlab-doc/examples/tests + cp -p debian/testdemos.py debian/python-reportlab-doc/usr/share/doc/python-reportlab-doc/examples/. + cp -rp tools/pythonpoint/demos debian/python-reportlab-doc/usr/share/doc/python-reportlab-doc/pythonpoint-demos + : # Replace all '#!' calls to python with $(PY_INTERPRETER) + : # and make them executable + for i in `find debian/python-reportlab-doc -mindepth 3 -type f`; do \ + sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done + dh_installchangelogs -i + dh_link -i + dh_compress -i -X.py -X.pdf -X.odyssey.txt -X.xml + dh_fixperms -i + dh_python2 -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -a + dh_installchangelogs -a + rm -rf debian/python-renderpm-dbg/usr/share/doc/python-renderpm-dbg + ln -s python-renderpm debian/python-renderpm-dbg/usr/share/doc/python-renderpm-dbg + rm -rf debian/python-reportlab-accel-dbg/usr/share/doc/python-reportlab-accel-dbg + ln -s python-reportlab-accel debian/python-reportlab-accel-dbg/usr/share/doc/python-reportlab-accel-dbg + + dh_compress -a -X.py -X.pdf -X.odyssey.txt -X.xml + dh_fixperms -a + dh_python2 -a + dh_strip -ppython-renderpm --dbg-package=python-renderpm-dbg + dh_strip -ppython-reportlab-accel --dbg-package=python-reportlab-accel-dbg + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- python-reportlab-2.4.orig/debian/python-reporlab-accel.debhelper.log +++ python-reportlab-2.4/debian/python-reporlab-accel.debhelper.log @@ -0,0 +1,3 @@ +dh_strip +dh_strip +dh_strip --- python-reportlab-2.4.orig/debian/copyright +++ python-reportlab-2.4/debian/copyright @@ -0,0 +1,113 @@ +This is the Debian package of ReportLab, a Python library to creat PDF +documents. The Debian package of ReportLab was put together by Gregor Hoffleit +. + +The upstream source for ReportLab is http://www.reportlab.com/. + +ReportLab was written by ReportLab Inc. . + + + +Most of ReportLab is Copyright (c) 2000-2008, ReportLab Inc., and +licensed under the terms listed below. + +Portions of the code included in ReportLab (LibHnj - a library for +high quality hyphenation and justification) are Copyright (C) 1998 +Raph Levien, and are dual licensed under LGPL and MPL, see below (on +Debian systems, the complete text of the LGPL can be found as +/usr/share/common-licenses/LGPL, the complete text of the MPL is +available as http://www.mozilla.org/MPL/). + +This is the license of ReportLab: + +##################################################################################### +# +# Copyright (c) 2000-2003, ReportLab Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of the company nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE OFFICERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +##################################################################################### + + +------------------------------------------------------------------------------- +/* LibHnj is dual licensed under LGPL and MPL. Boilerplate for both + * licenses follows. + */ + +/* LibHnj - a library for high quality hyphenation and justification + * Copyright (C) 1998 Raph Levien + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +/* + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "MPL"); you may not use this file except in + * compliance with the MPL. You may obtain a copy of the MPL at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the MPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL + * for the specific language governing rights and limitations under the + * MPL. + * + */ +------------------------------------------------------------------------------- + +renderPM/gt1/parseAFM.c: + +/* + * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved. + * + * This file may be freely copied and redistributed as long as: + * 1) This entire notice continues to be included in the file, + * 2) If the file has been modified in any way, a notice of such + * modification is conspicuously indicated. + * + * PostScript, Display PostScript, and Adobe are registered trademarks of + * Adobe Systems Incorporated. + * + * ************************************************************************ + * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT + * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS + * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR + * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY + * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, + * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. + * ************************************************************************ + */ --- python-reportlab-2.4.orig/debian/watch +++ python-reportlab-2.4/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/_/./g,dversionmangle=s/dfsg//" \ + http://www.reportlab.org/ftp/ReportLab_([\d_]+)\.tar.gz --- python-reportlab-2.4.orig/debian/README.Debian +++ python-reportlab-2.4/debian/README.Debian @@ -0,0 +1,19 @@ + + ReportLab for Debian + -------------------- + +This is the Debian package of ReportLab, a report generation toolkit for +Python. + +Examples and documentation can be found in the python-reportlab-doc package +in /usr/share/doc/python-reportlab-doc. + + + 05/22/2000, + Gregor Hoffleit + + 07/26/2005, + Igor Stroh + +Last change: 07/26/2005 + --- python-reportlab-2.4.orig/debian/compat +++ python-reportlab-2.4/debian/compat @@ -0,0 +1 @@ +5 --- python-reportlab-2.4.orig/debian/testdemos.py +++ python-reportlab-2.4/debian/testdemos.py @@ -0,0 +1,17 @@ +#!/bin/env python +#copyright ReportLab Inc. 2000 +#see license.txt for license details +#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/demos/tests/testdemos.py?cvsroot=reportlab +#$Header: /cvsroot/reportlab/reportlab/demos/tests/testdemos.py,v 1.7 2002/07/24 19:56:35 andy_robinson Exp $ +__version__=''' $Id: testdemos.py,v 1.7 2002/07/24 19:56:35 andy_robinson Exp $ ''' +__doc__='Test all demos' +_globals=globals().copy() +import os, sys +from reportlab import pdfgen + +for p in ('colors/colortest.py','stdfonts/stdfonts.py','odyssey/odyssey.py', 'gadflypaper/gfe.py'): + #fn = os.path.normcase(os.path.normpath(os.path.join(os.path.dirname(pdfgen.__file__),'..',p))) + fn = p + os.chdir(os.path.dirname(fn)) + execfile(os.path.basename(fn),_globals.copy()) + os.chdir('..') --- python-reportlab-2.4.orig/debian/changelog +++ python-reportlab-2.4/debian/changelog @@ -0,0 +1,246 @@ +python-reportlab (2.4-2) unstable; urgency=low + + * Build using dh_python2 instead of dh_pycentral, bump python build + dependency. Closes: #551691. + * Update watch files. Closes: #487307. + * Raise ValueError's instead of string exceptions. Closes: #585326. + + -- Matthias Klose Mon, 26 Jul 2010 12:05:54 +0200 + +python-reportlab (2.4-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Tue, 16 Feb 2010 23:32:55 +0100 + +python-reportlab (2.3-1) unstable; urgency=low + + * New upstream version. Closes: #501276. + - Fixes: PDFImage.getImageData() uses "sys" without importing it. + Closes: #241735. + - Fixes: CMAP file for japnese encodings. Closes: #292964. + - Fixes layouting crash. Closes: #495443. + - Uses free translation of the Odyssey text. Closes: #498551. + * Examples and demos are in the -doc package. Closes: #279377. + * Import sgmlop unqulified. Closes: #484025. + * python-renderpm packaged and recommended by python-reportlab. + Closes: #279376, #228054, #228056. + * Use python.mk macros for packaging. Closes: #547851. + + -- Matthias Klose Sun, 27 Sep 2009 10:27:13 +0200 + +python-reportlab (2.2-2) unstable; urgency=low + + * Adjust build dependencies for binary arch packages. Closes: #502636 + * Require python 2.4 or newer. Closes: #502133. + + -- Matthias Klose Sun, 19 Oct 2008 23:16:31 +0200 + +python-reportlab (2.2-1) unstable; urgency=low + + * New upstream version. + * Build the reportlab-accel and renderpm extensions from this source. + + -- Matthias Klose Tue, 23 Sep 2008 17:58:12 +0200 + +python-reportlab (2.1dfsg-2) unstable; urgency=low + + * Don't depend on python-xml; a slower parser is included in the source. + Closes: #468614. + + -- Matthias Klose Sun, 27 Apr 2008 18:02:35 +0200 + +python-reportlab (2.1dfsg-1) unstable; urgency=low + + * New upstream version. + - Doesn't contain the RML_UserGuide.pdf. Closes: #349075. + - reportlab.graphics.barcode module installed. Closes: #387014. + - Avoid warning with reserved keyword. Closes: #435742. + - BaseDocTemplate: Set author, title, subject and keywords on its + canvas. Closes: #349747. + * Depend on ttf-dustin, ttf-bitstream-vera, do not include copies of + the fonts. Closes: #457923. + + -- Matthias Klose Mon, 28 Jan 2008 21:03:56 +0100 + +python-reportlab (2.0dfsg-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sun, 16 Jul 2006 15:31:03 +0200 + +python-reportlab (1.20debian-7) unstable; urgency=low + + * python-reportlab: Add conflict/replaces to the versioned packages. + Closes: #374222. + + -- Matthias Klose Sun, 18 Jun 2006 02:12:33 +0000 + +python-reportlab (1.20debian-6) unstable; urgency=low + + * Switch maintainer and uploader. + * Convert to updated python policy, using python-central (the + extension reportlab-accel goes into the same direcory). + Closes: #373350. + + -- Matthias Klose Fri, 16 Jun 2006 23:31:54 +0200 + +python-reportlab (1.20debian-5) unstable; urgency=low + + * Imported python-reportlab package into debian python-modules svn repository + * debian/control: added Debian Python Modules Team to Uploaders + + -- Igor Stroh Sun, 16 Apr 2006 13:19:23 +0200 + +python-reportlab (1.20debian-4) unstable; urgency=low + + * Added Type1 and TT font paths to reportlab/rl_config, thanks + to Nicolas Chauvat and Samuele Giovanni Tonon (closes: #174639) + + -- Igor Stroh Wed, 12 Apr 2006 22:32:32 +0200 + +python-reportlab (1.20debian-3) unstable; urgency=low + + * Drop python2.1 and python2.2 packages. + * README.Debian: point to the -doc package (closes: #258404). + * Fix drawing of stacked 3D bars (Felipe Almeida Lessa). Closes: #349831). + + -- Matthias Klose Thu, 2 Feb 2006 20:29:54 +0000 + +python-reportlab (1.20debian-2) unstable; urgency=low + + * New maintainer + * Fixed README.Debian + * added debian/compat + * debian/control: bumped Standards-Version to 3.6.2 + * debian/rules: moved pythonpoint demos to python-reportlab-doc + + -- Igor Stroh Tue, 26 Jul 2005 12:51:54 +0200 + +python-reportlab (1.20debian-1) unstable; urgency=low + + * New upstream version. + * Add me as uploader. + + -- Matthias Klose Sun, 30 Jan 2005 21:25:17 +0100 + +python-reportlab (1.19debian-0.2) unstable; urgency=low + + * Fix bug in routine handling page breaks (closes Ubuntu #5274). + + -- Matthias Klose Wed, 12 Jan 2005 23:01:21 +0100 + +python-reportlab (1.19debian-0.1) unstable; urgency=low + + * NMU. + * New upstream version. + * Change section to python (closes: #218651). + * Add dependencies on shared libraries (closes: #213305). + * Add recommends on python-imaging (closes: #158656). + * Include the demos in the doc package, don't include the testsuite + and documentation sources in the pythonX.Y-reportlab packages. + Get the source package, if you need it ... + + -- Matthias Klose Sat, 7 Feb 2004 09:20:25 +0100 + +python-reportlab (1.18debian-1.1) unstable; urgency=low + + * Rebuild against python 2.3 (closes: #205742). + + -- Josselin Mouette Mon, 18 Aug 2003 16:23:57 +0200 + +python-reportlab (1.18debian-1) unstable; urgency=low + + * New upstream version 1.18. As in 1.17debian, I removed the files with + offending licenses in the Debian .orig.tar.gz. + * Correct the conflicts with older python-reportlab packages. + + -- Gregor Hoffleit Wed, 16 Jul 2003 10:31:18 +0200 + +python-reportlab (1.17debian-2) unstable; urgency=low + + * Make packages conflict with older python-reportlab package. + + -- Gregor Hoffleit Wed, 16 Jul 2003 09:45:44 +0200 + +python-reportlab (1.17debian-1) unstable; urgency=low + + * New upstream version. + * Due to license problems, I had to make changes to the upstream tarball: + - I had to remove three fonts from the font directory. They have been + replaced by free GPL fonts by Dustin Norlander. + - I had to remove the English translation of Homer's Odyssey by some + fake text. + Consequently, the pdf documentation and the source code has been adapted + to use the new fonts as well. + * This is not a pristine upstream tarball. To make this clear, I changed the + package version into 1.17debian. + * Provide python2.1, python2.2 and python2.3 versions of the package. Split + of the documentation into a separate package (PDF format). + + -- Gregor Hoffleit Sun, 4 May 2003 12:26:04 +0200 + +python-reportlab (1.15-2) unstable; urgency=low + + * Bump up to Python 2.2, which is the new default Python version in + unstable (closes: #161564, #158891). + + -- Gregor Hoffleit Tue, 24 Sep 2002 14:48:53 +0200 + +python-reportlab (1.15-1) unstable; urgency=low + + * New upstream version. + + -- Gregor Hoffleit Tue, 3 Sep 2002 22:03:56 +0200 + +python-reportlab (1.13-1) unstable; urgency=low + + * New upstream version. + + -- Gregor Hoffleit Wed, 3 Apr 2002 14:25:32 +0200 + +python-reportlab (1.11-2) unstable; urgency=low + + * Include the tools directory (closes: #128948). + + -- Gregor Hoffleit Tue, 15 Jan 2002 10:22:16 +0100 + +python-reportlab (1.11-1) unstable; urgency=low + + * New upstream version. + * Correct a spelling mistake in package description (closes: #125284). + + -- Gregor Hoffleit Sat, 29 Dec 2001 13:02:48 +0100 + +python-reportlab (1.10-2) unstable; urgency=low + + * Fix rules in order to use /usr/bin/python2.1 during build + (closes: #119997). + + -- Gregor Hoffleit Thu, 22 Nov 2001 00:28:18 +0100 + +python-reportlab (1.10-1) unstable; urgency=low + + * New upstream version. + * Recompiled for new default Python 2.1 (closes: #119212). + * Change dependencies accordingly (e.g. python-egenix-mxtexttools). + + -- Gregor Hoffleit Fri, 16 Nov 2001 11:12:24 +0100 + +python-reportlab (1.08-1) unstable; urgency=low + + * New upstream version. + + -- Gregor Hoffleit Wed, 20 Jun 2001 20:15:25 +0200 + +python-reportlab (1.07-1) unstable; urgency=low + + * New upstream version. + + -- Gregor Hoffleit Sun, 17 Jun 2001 22:02:15 +0200 + +python-reportlab (1.01-1) unstable; urgency=low + + * Initial Release. + + -- Gregor Hoffleit Wed, 11 Oct 2000 14:48:23 +0200 --- python-reportlab-2.4.orig/debian/control +++ python-reportlab-2.4/debian/control @@ -0,0 +1,84 @@ +Source: python-reportlab +Section: python +Priority: optional +Maintainer: Matthias Klose +Uploaders: Igor Stroh , Debian Python Modules Team +Standards-Version: 3.9.0 +XS-Python-Version: >= 2.4 +Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.6.5-9~), python-all-dbg, libart-2.0-dev, libfreetype6-dev +Build-Conflicts: python-setuptools + +Package: python-reportlab +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Recommends: python-reportlab-accel, python-renderpm, python-imaging (>= 1.1.6) +Suggests: pdf-viewer, python-egenix-mxtexttools (>= 2.0.6-3.1), python-reportlab-doc +Conflicts: python2.3-reportlab, python2.4-reportlab +Replaces: python2.3-reportlab, python2.4-reportlab +XB-Python-Version: ${python:Versions} +Description: ReportLab library to create PDF documents using Python + ReportLab is a library that lets you directly create documents in + Adobe's Portable Document Format (PDF) using the Python programming language. + . + ReportLab library creates PDF based on graphics commands without + intervening steps. It's therefore extremely fast, and flexible (since + you're using a full-blown programming language). + . + Sample use cases are: + * Dynamic PDF generation on the web + * High-volume corporate reporting and database publishing + * As embeddable print engine for other applications, including a + 'report language' so that users can customize their own reports. + * As 'build system' for complex documents with charts, tables and text + such as management accounts, statistical reports and scientific papers + * from XML to PDF in one step + +Package: python-reportlab-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: python-reportlab +Description: Documentation for the ReportLab Python library (PDF format) + ReportLab is a library that lets you directly create documents in + Adobe's Portable Document Format (PDF) using the Python programming language. + . + This package contains the documentation for ReportLab in PDF format. + +Package: python-reportlab-accel +Architecture: any +Depends: python-reportlab (>= ${source:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python2.3-reportlab-accel, python2.4-reportlab-accel +Replaces: python2.3-reportlab-accel, python2.4-reportlab-accel +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: C coded extension accelerator for the ReportLab Toolkit + A C coded extension accelerator for the ReportLab Toolkit. + +Package: python-reportlab-accel-dbg +Priority: extra +Architecture: any +Section: debug +Depends: python-reportlab-accel (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: C coded extension accelerator for the ReportLab Toolkit + A C coded extension accelerator for the ReportLab Toolkit. + +Package: python-renderpm +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${misc:Depends} +Suggests: python-renderpm-dbg +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: python low level render interface + This package contains the python low level render interface, + used in the ReportLab library. + +Package: python-renderpm-dbg +Priority: extra +Architecture: any +Section: debug +Depends: python-renderpm (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: python low level render interface (debug extension) + This package contains the python low level render interface, + used in the ReportLab library. + . + This package contains the extension built for the python debug interpreter. --- python-reportlab-2.4.orig/debian/debian-font-patches +++ python-reportlab-2.4/debian/debian-font-patches @@ -0,0 +1,301 @@ +Build instructions for the Debian source package +------------------------------------------------ + +- To build a dfsg compliant source tarball: + + * Remove the following font files: + fonts/LeERC___.AFM + fonts/LeERC___.PFB + fonts/luxiserif.ttf + fonts/luxiserif_license.txt + fonts/rina.ttf + fonts/rina_license.txt + tools/pythonpoint/demos/LeERC___.AFM + tools/pythonpoint/demos/LeERC___.PFB + + * Add the following font files (or depend on them): + fonts/Dustismo_Roman.ttf + fonts/PenguinAttack.ttf + fonts/Wargames.afm + fonts/Wargames.pfb + + * Apply the following patch to remove the copyrighted translation. + + * Rebuild the documentation in pdf format + + * Create the .orig.tar.gz tarball. + +diff -ur reportlab/demos/odyssey/odyssey.txt ./demos/odyssey/odyssey.txt +--- reportlab/demos/odyssey/odyssey.txt 2003-11-20 09:30:30.000000000 +0100 ++++ ./demos/odyssey/odyssey.txt 2004-02-06 11:10:42.000000000 +0100 +@@ -1,91 +1,51 @@ +-Provided by The Internet Classics Archive. +-See bottom for copyright. Available online at ++This is a placeholder for the English Odyssey translation ++provided by The Internet Classics Archive, which is ++available online at + http://classics.mit.edu//Homer/odyssey.html + +-The Odyssey +-By Homer ++Not The Odyssey ++Not By Homer + + +-Translated by Samuel Butler ++Not Translated by Samuel Butler + + ---------------------------------------------------------------------- + + BOOK I + ITell me, O muse, of that ingenious hero who travelled far and wide + a b c &| & | A' A ' after he had sacked the famous town of Troy. Many cities did he visit, +-and many were the nations with whose manners and customs he was acquainted; +-moreover he suffered much by sea while trying to save his own life +-and bring his men safely home; but do what he might he could not +-save1 +-his men, for they perished through their own sheer folly in eating +-the cattle of the Sun-god Hyperion; so the god prevented them from +-ever reaching home. Tell me, too, about all these things, O daughter +-of Jove, from whatsoever source you may know them. +- +-So now all who escaped death in battle or by shipwreck had got safely +-home except Ulysses, and he, though he was longing to return to his +-wife and country, was detained by the goddess Calypso, who had got +-him into a large cave and wanted to marry him. But as years went by, +-there came a time when the gods settled that he should go back to +-Ithaca; even then, however, when he was among his own people, his +-troubles were not yet over; nevertheless all the gods had now begun +-to pity him except Neptune, who still persecuted him without ceasing +-and would not let him get home. +- +-Now Neptune had gone off to the Ethiopians, who are at the world's +-end, and lie in two halves, the one looking West and the other East. +-He had gone there to accept a hecatomb of sheep and oxen, and was +-enjoying himself at his festival; but the other gods met in the house +-of Olympian Jove, and the sire of gods and men spoke first. At that +-moment he was thinking of Aegisthus, who had been killed by Agamemnon's +-son Orestes; so he said to the other gods: +- +-"See now, how men lay blame upon us gods for what is after all nothing +-but their own folly. Look at Aegisthus; he must needs make love to +-Agamemnon's wife unrighteously and then kill Agamemnon, though he +-knew it would be the death of him; for I sent Mercury to warn him +-not to do either of these things, inasmuch as Orestes would be sure +-to take his revenge when he grew up and wanted to return home. Mercury +-told him this in all good will but he would not listen, and now he +-has paid for everything in full." +- +-Then Minerva said, "Father, son of Saturn, King of kings, it served +-Aegisthus right, and so it would any one else who does as he did; +-but Aegisthus is neither here nor there; it is for Ulysses that my +-heart bleeds, when I think of his sufferings in that lonely sea-girt +-island, far away, poor man, from all his friends. It is an island +-covered with forest, in the very middle of the sea, and a goddess +-lives there, daughter of the magician Atlas, who looks after the bottom +-of the ocean, and carries the great columns that keep heaven and earth +-asunder. This daughter of Atlas has got hold of poor unhappy Ulysses, +-and keeps trying by every kind of blandishment to make him forget +-his home, so that he is tired of life, and thinks of nothing but how +-he may once more see the smoke of his own chimneys. You, sir, take +-no heed of this, and yet when Ulysses was before Troy did he not propitiate +-you with many a burnt sacrifice? Why then should you keep on being +-so angry with him?" +- +-And Jove said, "My child, what are you talking about? How can I forget +-Ulysses than whom there is no more capable man on earth, nor more +-liberal in his offerings to the immortal gods that live in heaven? +-Bear in mind, however, that Neptune is still furious with Ulysses +-for having blinded an eye of Polyphemus king of the Cyclopes. Polyphemus +-is son to Neptune by the nymph Thoosa, daughter to the sea-king Phorcys; +-therefore though he will not kill Ulysses outright, he torments him +-by preventing him from getting home. Still, let us lay our heads together +-and see how we can help him to return; Neptune will then be pacified, +-for if we are all of a mind he can hardly stand out against us." +- +-And Minerva said, "Father, son of Saturn, King of kings, if, then, +-the gods now mean that Ulysses should get home, we should first send +-Mercury to the Ogygian island to tell Calypso that we have made up +-our minds and that he is to return. In the meantime I will go to Ithaca, +-to put heart into Ulysses' son Telemachus; I will embolden him to +-call the Achaeans in assembly, and speak out to the suitors of his +-mother Penelope, who persist in eating up any number of his sheep +-and oxen; I will also conduct him to Sparta and to Pylos, to see if +-he can hear anything about the return of his dear father- for this +-will make people speak well of him." ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++ save1 ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. ++ ++This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. ++ ++This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. ++ ++"This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well." ++ ++And he replied, ++"This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well." + + Ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis. + Ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis. +@@ -97,106 +57,46 @@ + Ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis. + Ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis ellipsis. + +-"Men of Ithaca, it is all your own fault that things have turned out +-as they have; you would not listen to me, nor yet to Mentor, when +-we bade you check the folly of your sons who were doing much wrong +-in the wantonness of their hearts- wasting the substance and dishonouring +-the wife of a chieftain who they thought would not return. Now, however, +-let it be as I say, and do as I tell you. Do not go out against Ulysses, +-or you may find that you have been drawing down evil on your own heads." +- +-This was what he said, and more than half raised a loud shout, and +-at once left the assembly. But the rest stayed where they were, for +-the speech of Halitherses displeased them, and they sided with Eupeithes; +-they therefore hurried off for their armour, and when they had armed +-themselves, they met together in front of the city, and Eupeithes +-led them on in their folly. He thought he was going to avenge the +-murder of his son, whereas in truth he was never to return, but was +-himself to perish in his attempt. +- +-Then Minerva said to Jove, "Father, son of Saturn, king of kings, +-answer me this question- What do you propose to do? Will you set them +-fighting still further, or will you make peace between them?" +- +-And Jove answered, "My child, why should you ask me? Was it not by +-your own arrangement that Ulysses came home and took his revenge upon +-the suitors? Do whatever you like, but I will tell you what I think +-will be most reasonable arrangement. Now that Ulysses is revenged, +-let them swear to a solemn covenant, in virtue of which he shall continue +-to rule, while we cause the others to forgive and forget the massacre +-of their sons and brothers. Let them then all become friends as heretofore, +-and let peace and plenty reign." +- +-This was what Minerva was already eager to bring about, so down she +-darted from off the topmost summits of Olympus. +- +-Now when Laertes and the others had done dinner, Ulysses began by +-saying, "Some of you go out and see if they are not getting close +-up to us." So one of Dolius's sons went as he was bid. Standing on +-the threshold he could see them all quite near, and said to Ulysses, +-"Here they are, let us put on our armour at once." +- +-They put on their armour as fast as they could- that is to say Ulysses, +-his three men, and the six sons of Dolius. Laertes also and Dolius +-did the same- warriors by necessity in spite of their grey hair. When +-they had all put on their armour, they opened the gate and sallied +-forth, Ulysses leading the way. +- +-Then Jove's daughter Minerva came up to them, having assumed the form +-and voice of Mentor. Ulysses was glad when he saw her, and said to +-his son Telemachus, "Telemachus, now that are about to fight in an +-engagement, which will show every man's mettle, be sure not to disgrace +-your ancestors, who were eminent for their strength and courage all +-the world over." +- +-"You say truly, my dear father," answered Telemachus, "and you shall +-see, if you will, that I am in no mind to disgrace your family." +- +-Laertes was delighted when he heard this. "Good heavens, he exclaimed, +-"what a day I am enjoying: I do indeed rejoice at it. My son and grandson +-are vying with one another in the matter of valour." +- +-On this Minerva came close up to him and said, "Son of Arceisius- +-best friend I have in the world- pray to the blue-eyed damsel, and +-to Jove her father; then poise your spear and hurl it." +- +-As she spoke she infused fresh vigour into him, and when he had prayed +-to her he poised his spear and hurled it. He hit Eupeithes' helmet, +-and the spear went right through it, for the helmet stayed it not, +-and his armour rang rattling round him as he fell heavily to the ground. +-Meantime Ulysses and his son fell the front line of the foe and smote +-them with their swords and spears; indeed, they would have killed +-every one of them, and prevented them from ever getting home again, +-only Minerva raised her voice aloud, and made every one pause. "Men +-of Ithaca," she cried, cease this dreadful war, and settle the matter +-at once without further bloodshed." +- +-On this pale fear seized every one; they were so frightened that their +-arms dropped from their hands and fell upon the ground at the sound +-of the goddess's voice, and they fled back to the city for their lives. +-But Ulysses gave a great cry, and gathering himself together swooped +-down like a soaring eagle. Then the son of Saturn sent a thunderbolt +-of fire that fell just in front of Minerva, so she said to Ulysses, +-"Ulysses, noble son of Laertes, stop this warful strife, or Jove will +-be angry with you." +- +-Thus spoke Minerva, and Ulysses obeyed her gladly. Then Minerva assumed +-the form and voice of Mentor, and presently made a covenant of peace +-between the two contending parties. ++And he went on, ++"This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well." ++ ++This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. ++ ++This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. ++ ++This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. ++ ++This paragraph he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless, ++and this sentence he intentionally left meaningless as well. + + THE END + + ---------------------------------------------------------------------- + + Copyright statement: +-The Internet Classics Archive by Daniel C. Stevenson, Web Atomics. +-World Wide Web presentation is copyright (C) 1994-1998, Daniel +-C. Stevenson, Web Atomics. +-All rights reserved under international and pan-American copyright +-conventions, including the right of reproduction in whole or in part +-in any form. Direct permission requests to classics@classics.mit.edu. +-Translation of "The Deeds of the Divine Augustus" by Augustus is +-copyright (C) Thomas Bushnell, BSG. ++This text is nonsense, therefore I don't claim any copyright. + + + To really test that reportlab can produce pages quickly download the --- python-reportlab-2.4.orig/tools/pythonpoint/pythonpoint.py +++ python-reportlab-2.4/tools/pythonpoint/pythonpoint.py @@ -708,7 +708,7 @@ ##class PPDrawingElement: ## """Base class for something which you draw directly on the page.""" ## def drawOn(self, canv): -## raise "NotImplementedError", "Abstract base class!" +## raise NotImplementedError, "Abstract base class!" class PPFixedImage: --- python-reportlab-2.4.orig/src/reportlab/lib/pdfencrypt.py +++ python-reportlab-2.4/src/reportlab/lib/pdfencrypt.py @@ -506,14 +506,14 @@ print usage return if len(argv)<2: - raise "Must include a filename and one or more arguments!" + raise ValueError, "Must include a filename and one or more arguments!" if argv[0] not in known_modes: infile = argv[0] argv = argv[1:] if not os.path.isfile(infile): - raise "Can't open input file '%s'!" % infile + raise ValueError, "Can't open input file '%s'!" % infile else: - raise "First argument must be name of the PDF input file!" + raise ValueError, "First argument must be name of the PDF input file!" # meaningful name at this stage STRENGTH = 40 @@ -565,9 +565,9 @@ if thisarg[0] in binaryrequired: #try: if argv[pos+1] not in ('1', '0'): - raise "%s value must be either '1' or '0'!" % thisarg[1] + raise ValueError, "%s value must be either '1' or '0'!" % thisarg[1] #except: - #raise "Unable to set %s." % thisarg[4] + #raise ValueError, "Unable to set %s." % thisarg[4] try: if argv[pos+1] not in known_modes: if thisarg[0] in binaryrequired: @@ -579,7 +579,7 @@ argv.remove(argv[pos+1]) argv.remove(thisarg[0]) except: - raise "Unable to set %s." % thisarg[3] + raise ValueError, "Unable to set %s." % thisarg[3] if verbose>4: #useful if feeling paranoid and need to double check things at this point... @@ -611,7 +611,7 @@ print "wrote output file '%s'(%s bytes)\n owner password is '%s'\n user password is '%s'" % (SAVEFILE, filesize, OWNER, USER) if len(argv)>0: - raise "\nUnrecognised arguments : %s\nknown arguments are:\n%s" % (str(argv)[1:-1], known_modes) + raise ValueError, "\nUnrecognised arguments : %s\nknown arguments are:\n%s" % (str(argv)[1:-1], known_modes) else: print usage --- python-reportlab-2.4.orig/src/reportlab/pdfgen/canvas.py +++ python-reportlab-2.4/src/reportlab/pdfgen/canvas.py @@ -667,7 +667,7 @@ elif fit == "FitBV": dest.fitbv(left) else: - raise "Unknown Fit type %s" % (fit,) + raise ValueError, "Unknown Fit type %s" % (fit,) dest.setPage(pageref) return dest --- python-reportlab-2.4.orig/src/rl_addons/rl_accel/_rl_accel.c +++ python-reportlab-2.4/src/rl_addons/rl_accel/_rl_accel.c @@ -1360,7 +1360,7 @@ static void BoxFree(BoxObject* self) { - PyMem_DEL(self); + PyObject_Del(self); } static int Box_set_int(char* name, int* pd, PyObject *value) @@ -1492,7 +1492,7 @@ double w; if(!PyArg_ParseTupleAndKeywords(args,kw,"d|O:Box",kwlist,&w,&pC)) return NULL; - if(!(self = PyObject_NEW(BoxObject, &BoxType))) return NULL; + if(!(self = PyObject_New(BoxObject, &BoxType))) return NULL; self->shrink = self->stretch = self->penalty = (double)(self->is_glue = self->is_penalty = self->flagged = 0); self->is_box = 1; self->width = w; --- python-reportlab-2.4.orig/src/rl_addons/renderPM/setup.py +++ python-reportlab-2.4/src/rl_addons/renderPM/setup.py @@ -12,6 +12,14 @@ if len(D)==3: break return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % string.join(map(lambda k,D=D: D.get(k,'?'),K),'.') +def installed_libart_version(): + fn = '/usr/include/libart-2.0/libart_lgpl/libart-features.h' + for l in open(fn, 'r').readlines(): + if l.startswith('#define LIBART_VERSION'): + v = string.split(l[:-1], ' ')[-1] + return v + return '"0.0.0"' + if sys.hexversion<0x20000a0: import struct sys.byteorder = struct.pack('>L',0x12345678)==struct.pack('L',0x12345678) and 'big' or 'little' @@ -41,20 +49,20 @@ from distutils.core import setup, Extension pJoin=os.path.join - LIBART_VERSION = libart_version() + LIBART_VERSION = installed_libart_version() SOURCES=['_renderPM.c'] DEVEL_DIR=os.curdir - LIBART_DIR=pJoin(DEVEL_DIR,'libart_lgpl') - LIBART_SRCS=glob(pJoin(LIBART_DIR, 'art_*.c')) + LIBART_DIR='/usr/include/libart-2.0' + LIBART_SRCS=[] GT1_DIR=pJoin(DEVEL_DIR,'gt1') platform = sys.platform - LIBS = [] #assume empty libraries list + LIBS = ['art_lgpl_2'] #assume empty libraries list - if os.path.isdir('/usr/local/include/freetype2'): + if os.path.isdir('/usr/include/freetype2'): FT_LIB = ['freetype'] - FT_LIB_DIR = ['/usr/local/lib'] + FT_LIB_DIR = [] FT_MACROS = [('RENDERPM_FT',None)] - FT_INC_DIR = ['/usr/local/include','/usr/local/include/freetype2'] + FT_INC_DIR = ['/usr/include/freetype2'] else: ft_lib = check_ft_lib() if ft_lib: @@ -75,18 +83,11 @@ author_email = "robin@reportlab.com", url = "http://www.reportlab.com", packages = [], - libraries=[('_renderPM_libart', - { - 'sources': LIBART_SRCS, - 'include_dirs': [DEVEL_DIR,LIBART_DIR,], - 'macros': [('LIBART_COMPILATION',None),]+BIGENDIAN('WORDS_BIGENDIAN')+MACROS, - #'extra_compile_args':['/Z7'], - } - ), + libraries=[ ('_renderPM_gt1', { 'sources': pfxJoin(GT1_DIR,'gt1-dict.c','gt1-namecontext.c','gt1-parset1.c','gt1-region.c','parseAFM.c'), - 'include_dirs': [DEVEL_DIR,GT1_DIR,], + 'include_dirs': [LIBART_DIR, DEVEL_DIR,GT1_DIR,], 'macros': MACROS, #'extra_compile_args':['/Z7'], } --- python-reportlab-2.4.orig/src/rl_addons/renderPM/gt1/gt1-misc.h +++ python-reportlab-2.4/src/rl_addons/renderPM/gt1/gt1-misc.h @@ -4,9 +4,7 @@ #define __GT1_MISC_H__ #include /* for malloc, etc. */ -#ifdef macintosh #include /* for memcpy() */ -#endif #define gt1_alloc malloc #define gt1_free free --- python-reportlab-2.4.orig/src/rl_addons/renderPM/gt1/parseAFM.c +++ python-reportlab-2.4/src/rl_addons/renderPM/gt1/parseAFM.c @@ -158,8 +158,7 @@ * reads all tokens until the next end-of-line. */ -static char *token(stream) - FILE *stream; +static char *token(FILE *stream) { int ch, idx; @@ -194,8 +193,7 @@ * more than one word (like Comment lines and FullName). */ -static char *linetoken(stream) - FILE *stream; +static char *linetoken(FILE *stream) { int ch, idx; @@ -227,8 +225,7 @@ * The algorithm is a standard Knuth binary search. */ -static enum parseKey recognize(ident) - register char *ident; +static enum parseKey recognize(register char *ident) { int lower = 0, upper = (int) NOPE, midpoint, cmpvalue; BOOL found = FALSE; @@ -270,9 +267,7 @@ * parseFile to determine if there is more file to parse. */ -static BOOL parseGlobals(fp, gfi) - FILE *fp; - register GlobalFontInfo *gfi; +static BOOL parseGlobals(FILE *fp, register GlobalFontInfo *gfi) { BOOL cont = TRUE, save = (gfi != NULL); int error = AFM_ok; @@ -438,9 +433,7 @@ * file is reset to be where it was upon entering this function. */ -static int initializeArray(fp, cwi) - FILE *fp; - register int *cwi; +static int initializeArray(FILE *fp, register int *cwi) { BOOL cont = TRUE, found = FALSE; long opos = ftell(fp); @@ -522,9 +515,7 @@ * parseFile to determine if there is more file to parse. */ -static int parseCharWidths(fp, cwi) - FILE *fp; - register int *cwi; +static int parseCharWidths(FILE *fp, register int *cwi) { BOOL cont = TRUE, save = (cwi != NULL); int pos = 0, error = AFM_ok; @@ -623,9 +614,7 @@ * parseFile to determine if there is more file to parse. */ -static int parseCharMetrics(fp, fi) - FILE *fp; - register Font_Info *fi; +static int parseCharMetrics(FILE *fp, register Font_Info *fi) { BOOL cont = TRUE, firstTime = TRUE; int error = AFM_ok, count = 0; @@ -734,9 +723,7 @@ * parseFile to determine if there is more file to parse. */ -static int parseTrackKernData(fp, fi) - FILE *fp; - register Font_Info *fi; +static int parseTrackKernData(FILE *fp, register Font_Info *fi) { BOOL cont = TRUE, save = (fi->tkd != NULL); int pos = 0, error = AFM_ok, tcount = 0; @@ -838,9 +825,7 @@ * parseFile to determine if there is more file to parse. */ -static int parsePairKernData(fp, fi) - FILE *fp; - register Font_Info *fi; +static int parsePairKernData(FILE *fp, register Font_Info *fi) { BOOL cont = TRUE, save = (fi->pkd != NULL); int pos = 0, error = AFM_ok, pcount = 0; @@ -964,9 +949,7 @@ * parseFile to determine if there is more file to parse. */ -static int parseCompCharData(fp, fi) - FILE *fp; - register Font_Info *fi; +static int parseCompCharData(FILE *fp, register Font_Info *fi) { BOOL cont = TRUE, firstTime = TRUE, save = (fi->ccd != NULL); int pos = 0, j = 0, error = AFM_ok, ccount = 0, pcount = 0; @@ -1099,10 +1082,7 @@ * pointer upon return of this function is undefined. */ -extern int parseFile (fp, fi, flags) - FILE *fp; - Font_Info **fi; - FLAGS flags; +extern int parseFile (FILE *fp, Font_Info **fi, FLAGS flags) { int code = AFM_ok; /* return code from each of the parsing routines */