From d60a9156b2f57259a8479c98232a2cc9e913f569 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 18 Oct 2012 15:46:43 -0200 Subject: python2-reportlab-libre-2.6-1: updating version --- libre/python2-reportlab-libre/free-fonts.patch | 38 ++++++++++---------------- 1 file changed, 15 insertions(+), 23 deletions(-) mode change 100755 => 100644 libre/python2-reportlab-libre/free-fonts.patch (limited to 'libre/python2-reportlab-libre/free-fonts.patch') diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch old mode 100755 new mode 100644 index 9c79839b6..0359e4c2e --- a/libre/python2-reportlab-libre/free-fonts.patch +++ b/libre/python2-reportlab-libre/free-fonts.patch @@ -1,6 +1,6 @@ -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 +diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py +--- reportlab-2.6.orig/setup.py 2012-09-27 13:14:06.000000000 -0300 ++++ reportlab-2.6/setup.py 2012-10-18 14:34:16.750336101 -0200 @@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil infoline("Standard T1 font curves already downloaded") return @@ -8,10 +8,10 @@ diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py - infoline("Downloading standard T1 font curves") + #infoline("Downloading standard T1 font curves") -- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") +- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") - zipdata = StringIO.StringIO(remotehandle.read()) - remotehandle.close() -+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip") ++ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") + #zipdata = StringIO.StringIO(remotehandle.read()) + #remotehandle.close() archive = zipfile.ZipFile(zipdata) @@ -26,9 +26,9 @@ diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py 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 +diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py +--- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py 2012-09-27 11:39:39.000000000 -0300 ++++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py 2012-10-18 14:36:08.018365073 -0200 @@ -72,20 +72,20 @@ _font2fnrMapWin32 = { } if sys.platform in ('linux2',): @@ -64,9 +64,9 @@ diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/s } _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 +diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py +--- reportlab-2.6.orig/src/reportlab/rl_config.py 2012-09-27 11:39:39.000000000 -0300 ++++ reportlab-2.6/src/reportlab/rl_config.py 2012-10-18 14:47:45.619021247 -0200 @@ -49,25 +49,7 @@ ttfAsciiReadable= 1 # places to look for T1Font information @@ -94,7 +94,7 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor '%(REPORTLAB_DIR)s/fonts', #special '%(REPORTLAB_DIR)s/../fonts', #special '%(REPORTLAB_DIR)s/../../fonts', #special -@@ -76,44 +58,17 @@ T1SearchPath = ( +@@ -76,10 +58,7 @@ T1SearchPath = ( # places to look for TT Font information TTFSearchPath = ( @@ -106,15 +106,7 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor '%(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', -- - ) +@@ -95,25 +74,8 @@ TTFSearchPath = ( # places to look for CMap files - should ideally merge with above CMapSearchPath = ( @@ -137,8 +129,8 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor - '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', ++ '/usr/share/ghostscript/9.04/Resource/CMap', ++ '/usr/share/ghostscript/9.06/Resource/CMap', '%(REPORTLAB_DIR)s/fonts/CMap', #special '%(REPORTLAB_DIR)s/../fonts/CMap', #special '%(REPORTLAB_DIR)s/../../fonts/CMap', #special -- cgit v1.2.3-54-g00ecf