================================ fontconfig:source=2.6.0-3 (previous: 2.6.0-2) cvc rdiff fontconfig -1 /weasel.rpath.org@wgl:3-devel/2.6.0-3 ================================ 2.6.0-3 Filip Brcic (brcha@xxxxxxx) Thu Jan 7 13:36:43 2010 fixed recipe + added metadata fontconfig-2.6.0-parallel.patch: new --- /dev/null +++ fontconfig-2.6.0-parallel.patch @@ -0,0 +22 @@ +=== modified file 'fc-case/Makefile.am' +--- fc-case/Makefile.am 2008-06-22 15:28:39 +0000 ++++ fc-case/Makefile.am 2008-06-22 15:50:28 +0000 +@@ -36,6 +36,8 @@ + + noinst_MANS=fc-case.man + ++noinst_HEADERS=$(TARG) ++ + fc_case_SRCS= \ + fc-case.c \ + fccaseint.h \ +@@ -52,7 +54,7 @@ + + ALIAS_FILES = fcalias.h fcaliastail.h + +-BUILT_SOURCES = $(ALIAS_FILES) $(TARG) ++BUILT_SOURCES = $(ALIAS_FILES) + + $(ALIAS_FILES): + touch $(ALIAS_FILES) + fontconfig.tagdescription: new --- /dev/null +++ fontconfig.tagdescription @@ -0,0 +4 @@ +file %(taghandlerdir)s/fontconfig +implements files update +implements files remove +include %(sysconfdir)s/fonts/.version fontconfig.taghandler: new --- /dev/null +++ fontconfig.taghandler @@ -0,0 +23 @@ +#!/bin/bash + +if [ $# -lt 2 ]; then + echo "not enough arguments: $0 $*" >&2 + exit 1 +fi + +type="$1" +shift +action="$1" +shift + +case $type in + files) + case $action in + update|remove) + %(bindir)s/fc-cache -sr >/dev/null + ;; + esac + ;; +esac + +exit 0 fontconfig.recipe: changed Index: fontconfig.recipe ==================================================================== contents(size sha1) inode(mtime) --- fontconfig.recipe /weasel.rpath.org@wgl:3-devel/2.6.0-2 +++ fontconfig.recipe /weasel.rpath.org@wgl:3-devel/2.6.0-3 @@ -1,42 +1,62 @@ # -# Copyright (c) 2004-2009 rPath, Inc. -# This file is distributed under the terms of the MIT License. -# A copy is available at http://www.rpath.com/permanent/mit-license.html +# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxx> +# Distributed under the terms of the GNU General Public License v3 # -class Fontconfig(CPackageRecipe): +import uuid + +class Fontconfig(AutoPackageRecipe): name = 'fontconfig' version = '2.6.0' buildRequires = [ - 'freetype:devel', 'expat:devel', 'perl:runtime', 'pkg-config:devel', - 'zlib:devel', - ] + 'autoconf:runtime', 'automake:runtime', 'expat:devel', + 'freetype:devel', 'libtool:runtime', 'pkg-config:devel', + 'zlib:devel', 'perl:runtime', + ] - def setup(r): - r.addArchive('http://www.fontconfig.org/release/') + shortDesc = 'Font configuration library' + longDesc = 'A library for configuring and customizing font access' + url = 'http://fontconfig.org/' + licenses = [ 'MIT' ] + categories = [ 'Media/Libraries' ] - r.extraConf = ( + def unpack(r): + r.addArchive('http://fontconfig.org/release/') + r.addPatch('fontconfig-2.6.0-parallel.patch') + r.Autoreconf() + + def configure(r): + r.Configure( + ' --localstatedir=%(localstatedir)s' + ' --with-docdir=%(thisdocdir)s' ' --with-default-fonts=%(datadir)s/fonts' - ' --with-add-fonts=%(prefix)s/local/share/fonts' - ' --disable-docs' + ' --with-add-fonts=/usr/local/share/fonts' ) - if Arch.x86_64: - # First build 32bit libs - macros32 = r.macros.copy() - macros32.cc = '"gcc -m32"' - macros32.cxx = '"g++ -m32"' - macros32.libdir = '%(prefix)s/lib' - r.Configure(r.extraConf, - objDir='build32', overrideMacros=macros32, - preConfigure='USE_ARCH=32') - r.Make(dir='build32', overrideMacros=macros32) - r.MakeInstall(dir='build32', overrideMacros=macros32) - r.NormalizePkgConfig(exceptions='.*') - - r.Configure(r.extraConf) - r.Make() + def makeinstall(r): r.MakeInstall() - r.ComponentRequires({'runtime': set(('lib', 'devellib'))}) + r.Install('fc-lang/*.orth', '%(datadir)s/fc-lang/') + + r.Install('fonts.conf', '%(sysconfdir)s/fonts/') + + r.Install('*/*.1', '%(mandir)s/man1/') + r.Install('doc/fonts-conf.5', '%(mandir)s/man5/fonts.conf.5') + + r.Doc('doc/fontconfig-user.{txt,pdf}') + + r.Install('doc/Fc*.3', '%(mandir)s/man3/') + + # r.Doc('doc/fontconfig-devel.html', dir='html') + # r.Doc('doc/fontconfig-devel.{txt,pdf}') + + r.Create('%(sysconfdir)s/fonts/.version', + contents=('%(version)s-' + str(uuid.uuid4()))) + r.addSource('fontconfig.tagdescription', + dest='%(tagdescriptiondir)s/fontconfig', + macros=True) + r.addSource('fontconfig.taghandler', + dest='%(taghandlerdir)s/fontconfig', + macros=True, mode=0755) + r.TagSpec('fontconfig', '%(sysconfdir)s/fonts/.version') Committed by: brcha