[weasel-commit] Source: xorgfontpackage=1-3.0.3
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Wed, 20 Jan 2010 19:36:01 -0500
================================
xorgfontpackage:source=1-3.0.3 (previous: 1-3.0.2)
cvc rdiff xorgfontpackage -1
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/1-3.0.3
================================
1-3.0.3 Filip Brcic (brcha@xxxxxxx) Wed Jan 20 19:35:49 2010
updated font recipe
xorgfontpackage.recipe: changed
Index: xorgfontpackage.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- xorgfontpackage.recipe
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/1-3.0.2
+++ xorgfontpackage.recipe
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/1-3.0.3
@@ -13,6 +13,8 @@
'font-util:runtime', 'fontconfig:runtime', 'mkfontdir:runtime',
'mkfontscale:runtime', 'pkg-config:devel', 'ttmkfdir' ]
+ extraConfig = ' --with-fontdir=%(fontdir)s'
+
def setup(r):
if r.__class__.__name__ == 'XorgFontPackageRecipe':
return
@@ -21,30 +23,11 @@
# --with-top-fontdir, but until then we use this lovely pattern
matching
r.macros.fonttype = r.name.split('-')[-1]
- if r.macros.fonttype == 'type1':
- r.macros.fontdir = '%(datadir)s/fonts/default/Type1'
- elif r.macros.fonttype in ('100dpi', '75dpi', 'cyrillic', 'misc'):
- r.macros.fontdir = '%(datadir)s/fonts/%(fonttype)s'
- elif r.macros.fonttype == 'ttf':
- r.macros.fontdir = '%(datadir)s/fonts/TTF'
- elif r.macros.fonttype == 'meltho':
- r.macros.fontdir = '%(datadir)s/fonts/OTF'
- elif r.macros.fonttype == 'speedo':
- r.macros.fontdir = '%(datadir)s/fonts/Speedo'
- elif r.macros.fonttype == 'ethiopic':
- r.macros.fontdir = '%(datadir)s/fonts'
- r.extraConfig = ' --with-otf-fontdir=%(datadir)s/fonts/OTF'
- r.extraConfig += ' --with-ttf-fontdir=%(datadir)s/fonts/TTF'
- else:
- raise Exception('Don\'t know where to package unknown font '
- 'type \'%s\'; please update XorgFontPackageRecipe'
- % r.macros.fonttype)
+ r.macros.fonttype = r.macros.fonttype.replace('type1', 'Type1') \
+ .replace('ttf', 'TTF') \
+ .replace('otf', 'OTF') \
+ .replace('speedo', 'Speedo')
- if r.macros.fonttype != 'ethiopic':
- r.extraConfig = ' --with-fontdir=%(fontdir)s'
+ r.macros.fontdir = '%(datadir)s/fonts/%(fonttype)s'
XorgDataPackageRecipe.setup(r)
-
- if r.macros.fonttype == 'type1':
- r.TagSpec('cacheable-font', '%(fontdir)s')
- r.TagSpec('x-font', '%(fontdir)s')
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: xorgfontpackage=1-3.0.3 - rbuilder
