From f9be9424232f831d7a9a157bf81e6b7921b8522e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 18 Oct 2012 15:45:30 -0200 Subject: python2-reportlab-libre: changing name folder --- libre/python-reportlab-libre/PKGBUILD | 41 ------- libre/python-reportlab-libre/free-fonts.patch | 144 ------------------------- libre/python2-reportlab-libre/PKGBUILD | 41 +++++++ libre/python2-reportlab-libre/free-fonts.patch | 144 +++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 185 deletions(-) delete mode 100755 libre/python-reportlab-libre/PKGBUILD delete mode 100755 libre/python-reportlab-libre/free-fonts.patch create mode 100755 libre/python2-reportlab-libre/PKGBUILD create mode 100755 libre/python2-reportlab-libre/free-fonts.patch diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD deleted file mode 100755 index 7ead18cba..000000000 --- a/libre/python-reportlab-libre/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez -# Contributor: William Rea -# Maintainer (Parabola): fauno -# Contributor: borgo -# Contributor (Parabola): André Silva - -pkgname=python-reportlab-libre -_origname=reportlab -pkgver=2.5 -pkgrel=2 -pkgdesc="A proven industry-strength PDF generating solution" -arch=('i686' 'x86_64') -depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') -license=('custom') -source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz - free-fonts.patch) -url="http://www.reportlab.org/rl_toolkit.html" -md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3' - '1fc63857754cf3e2987d2400d94e7cd7') -provides=("python-reportlab=$pkgver") -conflicts=('python-reportlab') -replaces=('python-reportlab') -optdepends=('ghostscript') - -build() { - cd $srcdir/${_origname}-$pkgver - - # python2 fix - for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ - src/reportlab/pdfgen/pycanvas.py; do - sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt - patch -p1 -i $srcdir/free-fonts.patch - - python2 setup.py install --root=$pkgdir --optimize=1 - install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch deleted file mode 100755 index 9c79839b6..000000000 --- a/libre/python-reportlab-libre/free-fonts.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py ---- reportlab-2.5-orig/setup.py 2010-06-16 13:56:53.000000000 +0200 -+++ reportlab-2.5/setup.py 2011-01-06 11:01:50.263333455 +0100 -@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - infoline("Standard T1 font curves already downloaded") - return - try: -- infoline("Downloading standard T1 font curves") -+ #infoline("Downloading standard T1 font curves") - -- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") -- zipdata = StringIO.StringIO(remotehandle.read()) -- remotehandle.close() -+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") -+ #zipdata = StringIO.StringIO(remotehandle.read()) -+ #remotehandle.close() - archive = zipfile.ZipFile(zipdata) - dst = pjoin(rl_dir, 'fonts') - -@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - except: - xitmsg = "Failed to download standard T1 font curves" - reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] -- infoline(xitmsg) -+ #infoline(xitmsg) - - def main(): - #test to see if we've a special command -diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/src/reportlab/pdfbase/_fontdata.py ---- reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py 2010-02-10 22:01:22.000000000 +0100 -+++ reportlab-2.5/src/reportlab/pdfbase/_fontdata.py 2011-01-06 11:03:59.459999025 +0100 -@@ -72,20 +72,20 @@ _font2fnrMapWin32 = { - } - if sys.platform in ('linux2',): - _font2fnrMapLinux2 ={ -- 'symbol': 'Symbol', -- 'zapfdingbats': 'ZapfDingbats', -- 'helvetica': 'Arial', -- 'helvetica-bold': 'Arial-Bold', -- 'helvetica-boldoblique': 'Arial-BoldItalic', -- 'helvetica-oblique': 'Arial-Italic', -- 'times-bold': 'TimesNewRoman-Bold', -- 'times-bolditalic':'TimesNewRoman-BoldItalic', -- 'times-italic': 'TimesNewRoman-Italic', -- 'times-roman': 'TimesNewRoman', -- 'courier-bold': 'Courier-Bold', -- 'courier-boldoblique': 'Courier-BoldOblique', -- 'courier': 'Courier', -- 'courier-oblique': 'Courier-Oblique', -+ 'symbol': 's050000l.pfb', -+ 'zapfdingbats': 'd050000l.pfb', -+ 'helvetica': 'n019003l.pfb', -+ 'helvetica-bold': 'n019004l.pfb', -+ 'helvetica-boldoblique': 'n019024l.pfb', -+ 'helvetica-oblique': 'n019023l.pfb', -+ 'times-bold': 'n021004l.pfb', -+ 'times-bolditalic':'n021024l.pfb', -+ 'times-italic': 'n021023l.pfb', -+ 'times-roman': 'n021003l.pfb', -+ 'courier-bold': 'n022004l.pfb', -+ 'courier-boldoblique': 'n022024l.pfb', -+ 'courier': 'n022003l.pfb', -+ 'courier-oblique': 'n022023l.pfb', - } - _font2fnrMap = _font2fnrMapLinux2 - for k, v in _font2fnrMap.items(): -diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/reportlab/rl_config.py ---- reportlab-2.5-orig/src/reportlab/rl_config.py 2010-09-30 13:27:09.000000000 +0200 -+++ reportlab-2.5/src/reportlab/rl_config.py 2011-01-06 11:01:50.266666714 +0100 -@@ -49,25 +49,7 @@ ttfAsciiReadable= 1 - - # places to look for T1Font information - T1SearchPath = ( -- 'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6 -- 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5 -- 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4 -- '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac? -- '/usr/lib/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4 -- '/usr/local/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4 -+ '/usr/share/fonts/Type1', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts', #special -@@ -76,44 +58,17 @@ T1SearchPath = ( - - # places to look for TT Font information - TTFSearchPath = ( -- 'c:/winnt/fonts', -- 'c:/windows/fonts', -- '/usr/lib/X11/fonts/TrueType/', -- '/usr/share/fonts/truetype', -+ '/usr/share/fonts/TTF', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts',#special - '%(HOME)s/fonts', #special -- #mac os X - from -- #http://developer.apple.com/technotes/tn/tn2024.html -- '~/Library/Fonts', -- '/Library/Fonts', -- '/Network/Library/Fonts', -- '/System/Library/Fonts', -- - ) - - # places to look for CMap files - should ideally merge with above - CMapSearchPath = ( -- '/usr/lib/Acrobat9/Resource/CMap', -- '/usr/lib/Acrobat8/Resource/CMap', -- '/usr/lib/Acrobat7/Resource/CMap', -- '/usr/lib/Acrobat6/Resource/CMap', -- '/usr/lib/Acrobat5/Resource/CMap', -- '/usr/lib/Acrobat4/Resource/CMap', -- '/usr/local/Acrobat9/Resource/CMap', -- '/usr/local/Acrobat8/Resource/CMap', -- '/usr/local/Acrobat7/Resource/CMap', -- '/usr/local/Acrobat6/Resource/CMap', -- '/usr/local/Acrobat5/Resource/CMap', -- '/usr/local/Acrobat4/Resource/CMap', -- 'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap', -+ '/usr/share/ghostscript/8.71/Resource/CMap', -+ '/usr/share/ghostscript/9.00/Resource/CMap', - '%(REPORTLAB_DIR)s/fonts/CMap', #special - '%(REPORTLAB_DIR)s/../fonts/CMap', #special - '%(REPORTLAB_DIR)s/../../fonts/CMap', #special diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD new file mode 100755 index 000000000..7ead18cba --- /dev/null +++ b/libre/python2-reportlab-libre/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $ +# Maintainer: +# Contributor: Angel 'angvp' Velasquez +# Contributor: William Rea +# Maintainer (Parabola): fauno +# Contributor: borgo +# Contributor (Parabola): André Silva + +pkgname=python-reportlab-libre +_origname=reportlab +pkgver=2.5 +pkgrel=2 +pkgdesc="A proven industry-strength PDF generating solution" +arch=('i686' 'x86_64') +depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') +license=('custom') +source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz + free-fonts.patch) +url="http://www.reportlab.org/rl_toolkit.html" +md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3' + '1fc63857754cf3e2987d2400d94e7cd7') +provides=("python-reportlab=$pkgver") +conflicts=('python-reportlab') +replaces=('python-reportlab') +optdepends=('ghostscript') + +build() { + cd $srcdir/${_origname}-$pkgver + + # python2 fix + for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ + src/reportlab/pdfgen/pycanvas.py; do + sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt + patch -p1 -i $srcdir/free-fonts.patch + + python2 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt +} diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch new file mode 100755 index 000000000..9c79839b6 --- /dev/null +++ b/libre/python2-reportlab-libre/free-fonts.patch @@ -0,0 +1,144 @@ +diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py +--- reportlab-2.5-orig/setup.py 2010-06-16 13:56:53.000000000 +0200 ++++ reportlab-2.5/setup.py 2011-01-06 11:01:50.263333455 +0100 +@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil + infoline("Standard T1 font curves already downloaded") + return + try: +- infoline("Downloading standard T1 font curves") ++ #infoline("Downloading standard T1 font curves") + +- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") +- zipdata = StringIO.StringIO(remotehandle.read()) +- remotehandle.close() ++ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") ++ #zipdata = StringIO.StringIO(remotehandle.read()) ++ #remotehandle.close() + archive = zipfile.ZipFile(zipdata) + dst = pjoin(rl_dir, 'fonts') + +@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil + except: + xitmsg = "Failed to download standard T1 font curves" + reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] +- infoline(xitmsg) ++ #infoline(xitmsg) + + def main(): + #test to see if we've a special command +diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/src/reportlab/pdfbase/_fontdata.py +--- reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py 2010-02-10 22:01:22.000000000 +0100 ++++ reportlab-2.5/src/reportlab/pdfbase/_fontdata.py 2011-01-06 11:03:59.459999025 +0100 +@@ -72,20 +72,20 @@ _font2fnrMapWin32 = { + } + if sys.platform in ('linux2',): + _font2fnrMapLinux2 ={ +- 'symbol': 'Symbol', +- 'zapfdingbats': 'ZapfDingbats', +- 'helvetica': 'Arial', +- 'helvetica-bold': 'Arial-Bold', +- 'helvetica-boldoblique': 'Arial-BoldItalic', +- 'helvetica-oblique': 'Arial-Italic', +- 'times-bold': 'TimesNewRoman-Bold', +- 'times-bolditalic':'TimesNewRoman-BoldItalic', +- 'times-italic': 'TimesNewRoman-Italic', +- 'times-roman': 'TimesNewRoman', +- 'courier-bold': 'Courier-Bold', +- 'courier-boldoblique': 'Courier-BoldOblique', +- 'courier': 'Courier', +- 'courier-oblique': 'Courier-Oblique', ++ 'symbol': 's050000l.pfb', ++ 'zapfdingbats': 'd050000l.pfb', ++ 'helvetica': 'n019003l.pfb', ++ 'helvetica-bold': 'n019004l.pfb', ++ 'helvetica-boldoblique': 'n019024l.pfb', ++ 'helvetica-oblique': 'n019023l.pfb', ++ 'times-bold': 'n021004l.pfb', ++ 'times-bolditalic':'n021024l.pfb', ++ 'times-italic': 'n021023l.pfb', ++ 'times-roman': 'n021003l.pfb', ++ 'courier-bold': 'n022004l.pfb', ++ 'courier-boldoblique': 'n022024l.pfb', ++ 'courier': 'n022003l.pfb', ++ 'courier-oblique': 'n022023l.pfb', + } + _font2fnrMap = _font2fnrMapLinux2 + for k, v in _font2fnrMap.items(): +diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/reportlab/rl_config.py +--- reportlab-2.5-orig/src/reportlab/rl_config.py 2010-09-30 13:27:09.000000000 +0200 ++++ reportlab-2.5/src/reportlab/rl_config.py 2011-01-06 11:01:50.266666714 +0100 +@@ -49,25 +49,7 @@ ttfAsciiReadable= 1 + + # places to look for T1Font information + T1SearchPath = ( +- 'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', +- 'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', +- 'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', +- 'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6 +- 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5 +- 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4 +- '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac? +- '/usr/lib/Acrobat9/Resource/Font', #Linux, Acrobat 5? +- '/usr/lib/Acrobat8/Resource/Font', #Linux, Acrobat 5? +- '/usr/lib/Acrobat7/Resource/Font', #Linux, Acrobat 5? +- '/usr/lib/Acrobat6/Resource/Font', #Linux, Acrobat 5? +- '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5? +- '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4 +- '/usr/local/Acrobat9/Resource/Font', #Linux, Acrobat 5? +- '/usr/local/Acrobat8/Resource/Font', #Linux, Acrobat 5? +- '/usr/local/Acrobat7/Resource/Font', #Linux, Acrobat 5? +- '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5? +- '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5? +- '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4 ++ '/usr/share/fonts/Type1', + '%(REPORTLAB_DIR)s/fonts', #special + '%(REPORTLAB_DIR)s/../fonts', #special + '%(REPORTLAB_DIR)s/../../fonts', #special +@@ -76,44 +58,17 @@ T1SearchPath = ( + + # places to look for TT Font information + TTFSearchPath = ( +- 'c:/winnt/fonts', +- 'c:/windows/fonts', +- '/usr/lib/X11/fonts/TrueType/', +- '/usr/share/fonts/truetype', ++ '/usr/share/fonts/TTF', + '%(REPORTLAB_DIR)s/fonts', #special + '%(REPORTLAB_DIR)s/../fonts', #special + '%(REPORTLAB_DIR)s/../../fonts',#special + '%(HOME)s/fonts', #special +- #mac os X - from +- #http://developer.apple.com/technotes/tn/tn2024.html +- '~/Library/Fonts', +- '/Library/Fonts', +- '/Network/Library/Fonts', +- '/System/Library/Fonts', +- + ) + + # places to look for CMap files - should ideally merge with above + CMapSearchPath = ( +- '/usr/lib/Acrobat9/Resource/CMap', +- '/usr/lib/Acrobat8/Resource/CMap', +- '/usr/lib/Acrobat7/Resource/CMap', +- '/usr/lib/Acrobat6/Resource/CMap', +- '/usr/lib/Acrobat5/Resource/CMap', +- '/usr/lib/Acrobat4/Resource/CMap', +- '/usr/local/Acrobat9/Resource/CMap', +- '/usr/local/Acrobat8/Resource/CMap', +- '/usr/local/Acrobat7/Resource/CMap', +- '/usr/local/Acrobat6/Resource/CMap', +- '/usr/local/Acrobat5/Resource/CMap', +- '/usr/local/Acrobat4/Resource/CMap', +- 'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap', +- 'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap', +- 'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap', +- 'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap', +- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap', +- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap', +- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap', ++ '/usr/share/ghostscript/8.71/Resource/CMap', ++ '/usr/share/ghostscript/9.00/Resource/CMap', + '%(REPORTLAB_DIR)s/fonts/CMap', #special + '%(REPORTLAB_DIR)s/../fonts/CMap', #special + '%(REPORTLAB_DIR)s/../../fonts/CMap', #special -- cgit v1.1-4-g5e80