summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-18 16:56:10 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-18 16:56:10 -0200
commitf839e33fae50a172e100f750aabf87ea0bd722cc (patch)
treee4dd94646febc0c73cea888e30bfdc3da1596f1e
parentd60a9156b2f57259a8479c98232a2cc9e913f569 (diff)
python2-reportlab-libre-2.6-1: fixing some things in free-fonts.patch
-rwxr-xr-xlibre/python2-reportlab-libre/PKGBUILD2
-rw-r--r--libre/python2-reportlab-libre/free-fonts.patch14
2 files changed, 12 insertions, 4 deletions
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index 2adbbc234..27014d100 100755
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -22,7 +22,7 @@ license=('custom')
source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz
free-fonts.patch)
md5sums=('e5d27a24a2c8456b168913242aa1940f'
- 'd3abd11dfee7d1cf2edbcc786792e3cd')
+ '1588b88851711cc6c868db4c7d4f4dea')
optdepends=('ghostscript')
build() {
diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch
index 0359e4c2e..b2683931b 100644
--- a/libre/python2-reportlab-libre/free-fonts.patch
+++ b/libre/python2-reportlab-libre/free-fonts.patch
@@ -66,7 +66,7 @@ diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/s
for k, v in _font2fnrMap.items():
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
++++ reportlab-2.6/src/reportlab/rl_config.py 2012-10-18 16:05:12.683766581 -0200
@@ -49,25 +49,7 @@ ttfAsciiReadable= 1
# places to look for T1Font information
@@ -94,7 +94,7 @@ diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/repor
'%(REPORTLAB_DIR)s/fonts', #special
'%(REPORTLAB_DIR)s/../fonts', #special
'%(REPORTLAB_DIR)s/../../fonts', #special
-@@ -76,10 +58,7 @@ T1SearchPath = (
+@@ -76,44 +58,17 @@ T1SearchPath = (
# places to look for TT Font information
TTFSearchPath = (
@@ -106,7 +106,15 @@ diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/repor
'%(REPORTLAB_DIR)s/fonts', #special
'%(REPORTLAB_DIR)s/../fonts', #special
'%(REPORTLAB_DIR)s/../../fonts',#special
-@@ -95,25 +74,8 @@ TTFSearchPath = (
+ '%(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 = (