--- fontconfig-2.3.2.orig/doc/Makefile +++ fontconfig-2.3.2/doc/Makefile @@ -0,0 +1,777 @@ +# Makefile.in generated by automake 1.7.9 from Makefile.am. +# doc/Makefile. Generated from Makefile.in by configure. + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# +# $Id: Makefile.am,v 1.22 2005/03/03 01:59:28 keithp Exp $ +# +# Copyright © 2003 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +srcdir = . +top_srcdir = .. + +pkgdatadir = $(datadir)/fontconfig +pkglibdir = $(libdir)/fontconfig +pkgincludedir = $(includedir)/fontconfig +top_builddir = .. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = i486-pc-linux-gnu +ACLOCAL = ${SHELL} /home/packages/tmp/fontconfig-2.3.2/missing --run aclocal-1.7 +AMDEP_FALSE = +AMDEP_TRUE = # +AMTAR = ${SHELL} /home/packages/tmp/fontconfig-2.3.2/missing --run tar +AR = ar +AS = as +AUTOCONF = ${SHELL} /home/packages/tmp/fontconfig-2.3.2/missing --run autoconf +AUTOHEADER = ${SHELL} /home/packages/tmp/fontconfig-2.3.2/missing --run autoheader +AUTOMAKE = ${SHELL} /home/packages/tmp/fontconfig-2.3.2/missing --run automake-1.7 +AWK = gawk + +CC = cc +CCDEPMODE = depmode=none +CC_FOR_BUILD = cc +CFLAGS = -g -Wall -O2 +CONFDIR = ${sysconfdir}/fonts +CPP = cc -E +CPPFLAGS = +CROSS_COMPILING_FALSE = +CROSS_COMPILING_TRUE = # +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=none +CXXFLAGS = -g -Wall -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DLLTOOL = dlltool +DOCDIR = ${datadir}/doc/fontconfig +DOCMAN3 = +DOCSRC = +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +ENABLE_DOCS_FALSE = +ENABLE_DOCS_TRUE = # +EXEEXT = +EXEEXT_FOR_BUILD = +EXPAT_CFLAGS = +EXPAT_LIBS = -lexpat +F77 = g77 +FC_ADD_FONTS = /usr/share/X11/fonts,/usr/local/share/fonts +FC_DEFAULT_FONTS = /usr/share/fonts +FC_FONTDATE = Fri Jul 7 11:08:08 UTC 2006 +FC_FONTPATH = /usr/share/X11/fonts /usr/local/share/fonts +FFLAGS = -g -O2 +FREETYPE_CFLAGS = -I/usr/include/freetype2 +FREETYPE_LIBS = -lfreetype -lz +HASDOCBOOK = no +HAVE_EXPAT = 1 +HAVE_XMLPARSE_H = +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +LT_CURRENT = 1 +LT_CURRENT_MINUS_AGE = 1 +LT_REVISION = 4 +LT_VERSION_INFO = 1:4:0 +MAINT = # +MAINTAINER_MODE_FALSE = +MAINTAINER_MODE_TRUE = # +MAKEINFO = ${SHELL} /home/packages/tmp/fontconfig-2.3.2/missing --run makeinfo +MS_LIB_AVAILABLE_FALSE = +MS_LIB_AVAILABLE_TRUE = # +OBJDUMP = objdump +OBJEXT = o +ORTH_FILES = aa.orth ab.orth af.orth am.orth ar.orth ast.orth ava.orth ay.orth az.orth az_ir.orth ba.orth bam.orth be.orth bg.orth bh.orth bho.orth bi.orth bin.orth bn.orth bo.orth br.orth bs.orth bua.orth ca.orth ce.orth ch.orth chm.orth chr.orth co.orth cs.orth cu.orth cv.orth cy.orth da.orth de.orth dz.orth el.orth en.orth eo.orth es.orth et.orth eu.orth fa.orth fi.orth fj.orth fo.orth fr.orth ful.orth fur.orth fy.orth ga.orth gd.orth gez.orth gl.orth gn.orth gu.orth gv.orth ha.orth haw.orth he.orth hi.orth ho.orth hr.orth hu.orth hy.orth ia.orth ibo.orth id.orth ie.orth ik.orth io.orth is.orth it.orth iu.orth ja.orth ka.orth kaa.orth ki.orth kk.orth kl.orth km.orth kn.orth ko.orth kok.orth ks.orth ku.orth ku_ir.orth kum.orth kv.orth kw.orth ky.orth la.orth lb.orth lez.orth lo.orth lt.orth lv.orth mg.orth mh.orth mi.orth mk.orth ml.orth mn.orth mo.orth mr.orth mt.orth my.orth nb.orth nds.orth ne.orth nl.orth nn.orth no.orth ny.orth oc.orth om.orth or.orth os.orth pa.orth pl.orth ps_af.orth ps_pk.orth pt.orth rm.orth ro.orth ru.orth sa.orth sah.orth sco.orth se.orth sel.orth sh.orth si.orth sk.orth sl.orth sm.orth sma.orth smj.orth smn.orth sms.orth so.orth sq.orth sr.orth sv.orth sw.orth syr.orth ta.orth te.orth tg.orth th.orth ti_er.orth ti_et.orth tig.orth tk.orth tl.orth tn.orth to.orth tr.orth ts.orth tt.orth tw.orth tyv.orth ug.orth uk.orth ur.orth uz.orth ven.orth vi.orth vo.orth vot.orth wa.orth wen.orth wo.orth xh.orth yap.orth yi.orth yo.orth zh_cn.orth zh_hk.orth zh_mo.orth zh_sg.orth zh_tw.orth zu.orth +OS_WIN32_FALSE = +OS_WIN32_TRUE = # +PACKAGE = fontconfig +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +USEDOCBOOK_FALSE = +USEDOCBOOK_TRUE = # +VERSION = 2.3.2 +WARN_CFLAGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing +ac_ct_AR = ar +ac_ct_AS = +ac_ct_CC = cc +ac_ct_CXX = +ac_ct_DLLTOOL = +ac_ct_F77 = g77 +ac_ct_OBJDUMP = +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = +am__fastdepCC_TRUE = # +am__fastdepCXX_FALSE = +am__fastdepCXX_TRUE = # +am__include = include +am__leading_dot = . +am__quote = +bindir = ${exec_prefix}/bin +build = i486-pc-linux-gnu +build_alias = i486-linux-gnu +build_cpu = i486 +build_os = linux-gnu +build_vendor = pc +confdir = ${sysconfdir}/fonts +datadir = ${prefix}/share +exec_prefix = ${prefix} +ft_config = /usr/bin/freetype-config +host = i486-pc-linux-gnu +host_alias = +host_cpu = i486 +host_os = linux-gnu +host_vendor = pc +includedir = ${prefix}/include +infodir = ${prefix}/share/info +install_sh = /home/packages/tmp/fontconfig-2.3.2/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${prefix}/lib/fontconfig +localstatedir = /var +mandir = ${prefix}/share/man +ms_librarian = +oldincludedir = /usr/include +prefix = /usr +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = /etc +target_alias = +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + +DOC_SRC = $(srcdir) +DOC_MODULE = fontconfig +DOC2HTML = docbook2html +DOC2TXT = docbook2txt +DOC2MAN = docbook2man +DOC2PDF = docbook2pdf + +TXT = fontconfig-user.txt fontconfig-devel.txt +PDF = fontconfig-user.pdf fontconfig-devel.pdf +HTML_FILES = fontconfig-user.html +HTML_DIR = fontconfig-devel +SGML = fontconfig-user.sgml fontconfig-devel.sgml +FNCS_TMPL = ${DOC_SRC}/func.sgml + +DOC_FUNCS_FNCS = \ + fcatomic.fncs \ + fcblanks.fncs \ + fccharset.fncs \ + fcconfig.fncs \ + fcconstant.fncs \ + fcfile.fncs \ + fcfontset.fncs \ + fcfreetype.fncs \ + fcinit.fncs \ + fcmatrix.fncs \ + fcobjectset.fncs \ + fcobjecttype.fncs \ + fcpattern.fncs \ + fcstring.fncs \ + fcstrset.fncs \ + fcvalue.fncs + + +DOC_FUNCS_SGML = \ + fcatomic.sgml \ + fcblanks.sgml \ + fccharset.sgml \ + fcconfig.sgml \ + fcconstant.sgml \ + fcfile.sgml \ + fcfontset.sgml \ + fcfreetype.sgml \ + fcinit.sgml \ + fcmatrix.sgml \ + fcobjectset.sgml \ + fcobjecttype.sgml \ + fcpattern.sgml \ + fcstring.sgml \ + fcstrset.sgml \ + fcvalue.sgml + + +man5_MANS = fonts-conf.5 +man3_MANS = $(DOCMAN3) + +noinst_PROGRAMS = edit-sgml +edit_sgml_SOURCES = edit-sgml.c + +docdir = ${datadir}/doc/fontconfig + +DOC_FILES = $(TXT) $(PDF) $(HTML_FILES) +LOCAL_DOCS = $(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/* + +EXTRA_DIST = $(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL) confdir.sgml.in + +SUFFIXES = .fncs .sgml .txt .html + +#STRIPNL = awk '{ if (NR > 1) printf ("\n"); printf ("%s", $$0); }' + +#CLEANFILES = confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml + +htmldocdir = $(docdir)/$(HTML_DIR) + +doc_DATA = $(DOC_FILES) + +htmldoc_DATA = $(HTML_DIR)/* +subdir = doc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = version.sgml +noinst_PROGRAMS = edit-sgml$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) + +am_edit_sgml_OBJECTS = edit-sgml.$(OBJEXT) +edit_sgml_OBJECTS = $(am_edit_sgml_OBJECTS) +edit_sgml_LDADD = $(LDADD) +edit_sgml_DEPENDENCIES = +edit_sgml_LDFLAGS = + +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +#DEP_FILES = ./$(DEPDIR)/edit-sgml.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +DIST_SOURCES = $(edit_sgml_SOURCES) + +NROFF = nroff +MANS = $(man3_MANS) $(man5_MANS) +DATA = $(doc_DATA) $(htmldoc_DATA) + +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am version.sgml.in +SOURCES = $(edit_sgml_SOURCES) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .fncs .sgml .txt .html .c .lo .o .obj .pdf +$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +Makefile: # $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +version.sgml: $(top_builddir)/config.status version.sgml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +edit-sgml$(EXEEXT): $(edit_sgml_OBJECTS) $(edit_sgml_DEPENDENCIES) + @rm -f edit-sgml$(EXEEXT) + $(LINK) $(edit_sgml_LDFLAGS) $(edit_sgml_OBJECTS) $(edit_sgml_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +#include ./$(DEPDIR)/edit-sgml.Po + +.c.o: +# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +# -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +# else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +# fi +# source='$<' object='$@' libtool=no +# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' +# $(CCDEPMODE) $(depcomp) + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + +.c.obj: +# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +# -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +# else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +# fi +# source='$<' object='$@' libtool=no +# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' +# $(CCDEPMODE) $(depcomp) + $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + +.c.lo: +# if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +# -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +# else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +# fi +# source='$<' object='$@' libtool=yes +# depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' +# $(CCDEPMODE) $(depcomp) + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +man3dir = $(mandir)/man3 +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man3dir) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ + done +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ + rm -f $(DESTDIR)$(man3dir)/$$inst; \ + done + +man5dir = $(mandir)/man5 +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man5dir) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ + rm -f $(DESTDIR)$(man5dir)/$$inst; \ + done +docDATA_INSTALL = $(INSTALL_DATA) +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(docdir) + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \ + $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(docdir)/$$f"; \ + rm -f $(DESTDIR)$(docdir)/$$f; \ + done +htmldocDATA_INSTALL = $(INSTALL_DATA) +install-htmldocDATA: $(htmldoc_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(htmldocdir) + @list='$(htmldoc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(htmldocDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldocdir)/$$f"; \ + $(htmldocDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldocdir)/$$f; \ + done + +uninstall-htmldocDATA: + @$(NORMAL_UNINSTALL) + @list='$(htmldoc_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(htmldocdir)/$$f"; \ + rm -f $(DESTDIR)$(htmldocdir)/$$f; \ + done + +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + $(mkinstalldirs) $(distdir)/$(HTML_DIR) $(distdir)/${DOC_SRC} + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) all-local + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(docdir) $(DESTDIR)$(htmldocdir) +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-docDATA install-htmldocDATA install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man3 install-man5 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-docDATA uninstall-htmldocDATA uninstall-info-am \ + uninstall-man + +uninstall-man: uninstall-man3 uninstall-man5 + +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-data install-data-am \ + install-docDATA install-exec install-exec-am \ + install-htmldocDATA install-info install-info-am install-man \ + install-man3 install-man5 install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-docDATA \ + uninstall-htmldocDATA uninstall-info-am uninstall-man \ + uninstall-man3 uninstall-man5 + + +#.fncs.sgml: +# $(RM) $@ +# ./edit-sgml$(EXEEXT) $(FNCS_TMPL) < '$<' > $*.sgml + +#.sgml.txt: +# $(RM) $@ +# $(DOC2TXT) $< + +#.sgml.pdf: +# $(RM) $@ +# $(DOC2PDF) $< + +#$(man3_MANS): func.refs + +#func.refs: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml +# $(RM) func.refs +# $(DOC2MAN) local-fontconfig-devel.sgml +# mv manpage.refs func.refs +# $(RM) manpage.links + +#local-fontconfig-devel.sgml: fontconfig-devel.sgml +# $(LN_S) $< $@ + +#$(DOC_FUNCS_SGML): edit-sgml$(EXEEXT) $(FNCS_TMPL) + +#fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml +# $(RM) $@ +# $(DOC2MAN) local-fontconfig-user.sgml +# $(RM) manpage.refs manpage.links + +#local-fontconfig-user.sgml: fontconfig-user.sgml +# $(LN_S) $< $@ + +#all-local: $(LOCAL_DOCS) + +#clean-local: +# $(RM) $(man3_MANS) $(man5_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs +# $(RM) -r $(HTML_DIR) + +#$(HTML_DIR): local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml +# $(RM) -r $(HTML_DIR) +# $(DOC2HTML) -o $(HTML_DIR) local-fontconfig-devel.sgml + +#fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml +# $(RM) $@ +# $(DOC2TXT) local-fontconfig-devel.sgml +# mv local-fontconfig-devel.txt $@ + +#fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml +# $(RM) $@ +# $(DOC2PDF) local-fontconfig-devel.sgml +# mv local-fontconfig-devel.pdf $@ + +#fontconfig-user.html: local-fontconfig-user.sgml version.sgml confdir.sgml +# $(RM) $@ local-$@ $@.tmp +# $(DOC2HTML) -u local-fontconfig-user.sgml > $@.tmp +# -test -f local-$@ && mv local-$@ $@ +# -test -f $@ || mv $@.tmp $@ +# -test -f $@.tmp && $(RM) $@.tmp + +#fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml +# $(RM) $@ +# $(DOC2TXT) local-fontconfig-user.sgml +# mv local-fontconfig-user.txt $@ + +#fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml +# $(RM) $@ +# $(DOC2PDF) local-fontconfig-user.sgml +# mv local-fontconfig-user.pdf $@ +#confdir.sgml: ${DOC_SRC}/confdir.sgml.in +# sed "s,@CONFDIR\@,${CONFDIR}," < ${DOC_SRC}/confdir.sgml.in | $(STRIPNL) > confdir.sgml + +all-local: +clean-local: + +$(HTML_DIR)/*: $(HTML_DIR) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: --- fontconfig-2.3.2.orig/doc/version.sgml +++ fontconfig-2.3.2/doc/version.sgml @@ -0,0 +1,24 @@ + +2.3.2 --- fontconfig-2.3.2.orig/src/fcdefault.c +++ fontconfig-2.3.2/src/fcdefault.c @@ -33,6 +33,7 @@ { FC_VERTICAL_LAYOUT, FcFalse }, /* FC_LOAD_VERTICAL_LAYOUT */ { FC_AUTOHINT, FcFalse }, /* FC_LOAD_FORCE_AUTOHINT */ { FC_GLOBAL_ADVANCE, FcTrue }, /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */ + { FC_EMBEDDED_BITMAP, FcTrue }, /* !FC_LOAD_NO_BITMAP */ }; #define NUM_FC_BOOL_DEFAULTS (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0]) --- fontconfig-2.3.2.orig/src/fcname.c +++ fontconfig-2.3.2/src/fcname.c @@ -70,6 +70,8 @@ { FC_CAPABILITY, FcTypeString }, { FC_FONTFORMAT, FcTypeString }, { FC_EMBOLDEN, FcTypeBool }, + { FC_EMBEDDED_BITMAP, FcTypeBool }, + { FC_ANY_METRICS, FcTypeBool }, }; #define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0]) --- fontconfig-2.3.2.orig/fonts.conf.in +++ fontconfig-2.3.2/fonts.conf.in @@ -72,6 +72,7 @@ Serif faces --> + DejaVu Serif Bitstream Vera Serif Times New Roman Thorndale AMT @@ -84,12 +85,14 @@ MS 明朝 Baekmuk Batang FreeSerif + MgOpen Canonica serif + DejaVu Sans Bitstream Vera Sans Helvetica Arial @@ -104,12 +107,14 @@ Baekmuk Dotum SimSun FreeSans + MgOpen Moderna sans-serif + DejaVu Sans Mono Bitstream Vera Sans Mono Courier Courier New @@ -141,19 +146,20 @@ + commented out, see below - Times - Nimbus Roman No9 L - + Times + Nimbus Roman No9 L + - Helvetica - Nimbus Sans L - + Helvetica + Nimbus Sans L + - Courier - Nimbus Mono L - + Courier + Nimbus Mono L + + --> + + + Times + + + true + + + Nimbus Roman No9 L + + + + + Helvetica + + + true + + + Nimbus Sans L + + + + + Courier + + + true + + + Nimbus Mono L + + + + + + + Times New Roman + Thorndale AMT + Thorndale + + + true + + + Times New Roman + Nimbus Roman No9 L + + + + + Arial + Albany AMT + Albany + Verdana + + + true + + + Arial + Nimbus Sans L + + + + + Courier New + Cumberland AMT + Cumberland + + + true + + + Courier New + Nimbus Mono L + + + + + + Bitstream Vera Serif ++ DejaVu Serif + Times New Roman + Thorndale AMT + Times +@@ -91,6 +92,7 @@ + --> + + Bitstream Vera Sans ++ DejaVu Sans + Helvetica + Arial + Verdana +@@ -111,6 +113,7 @@ + --> + + Bitstream Vera Sans Mono ++ DejaVu Sans Mono + Courier + Courier New + Andale Mono +@@ -259,6 +262,7 @@ + serif + + Bitstream Vera Serif ++ DejaVu Serif + Times New Roman + Thorndale AMT + Luxi Serif +@@ -277,6 +281,7 @@ + sans-serif + + Bitstream Vera Sans ++ DejaVu Sans + Verdana + Arial + Albany AMT +@@ -297,6 +302,7 @@ + monospace + + Bitstream Vera Sans Mono ++ DejaVu Sans Mono + Andale Mono + Courier New + Cumberland AMT --- fontconfig-2.3.2.orig/debian/patches/noftinternals.patch +++ fontconfig-2.3.2/debian/patches/noftinternals.patch @@ -0,0 +1,701 @@ +diff -urN fontconfig-2.3.2/src/fcfreetype.c fontconfig-2.3.2-new/src/fcfreetype.c +--- fontconfig-2.3.2/src/fcfreetype.c 2005-04-21 14:37:43.000000000 +0200 ++++ fontconfig-2.3.2-new/src/fcfreetype.c 2005-07-07 13:17:32.224401218 +0200 +@@ -50,14 +50,11 @@ + #include "fcint.h" + #include + #include FT_FREETYPE_H +-#include FT_INTERNAL_OBJECTS_H + #include FT_TRUETYPE_TABLES_H + #include FT_SFNT_NAMES_H + #include FT_TRUETYPE_IDS_H + #include FT_TYPE1_TABLES_H +-#include FT_INTERNAL_STREAM_H +-#include FT_INTERNAL_SFNT_H +-#include FT_INTERNAL_TRUETYPE_TYPES_H ++#include "fcftglue.h" + #if HAVE_FT_GET_X11_FONT_FORMAT + #include FT_XFREE86_H + #endif +@@ -65,8 +62,7 @@ + #if HAVE_FT_GET_BDF_PROPERTY + #include FT_BDF_H + #include FT_MODULE_H +-#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ +- (f)->driver->root.clazz->get_interface) ++#define HAS_BDF_PROPERTY(f) ((f)) + #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \ + FT_Get_BDF_Property(f,n,p) : \ + FT_Err_Invalid_Argument) +@@ -1559,7 +1555,7 @@ + */ + if (FcCharSetCount (cs) == 0) + { +- if (!strcmp(FT_MODULE_CLASS(&face->driver->root)->module_name, "pcf")) ++ if (!strcmp(FT_Get_X11_Font_Format(face),"PCF")) + goto bail2; + } + +@@ -2706,8 +2702,7 @@ + static FT_Error + GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *script_count) + { +- FT_ULong cur_offset, new_offset, base_offset; +- TT_Face tt_face = (TT_Face)face; ++ FT_ULong cur_offset, new_offset, base_offset; + FT_Stream stream = face->stream; + FT_Error error; + FT_UShort n, p; +@@ -2716,51 +2711,43 @@ + if ( !stream ) + return TT_Err_Invalid_Face_Handle; + +- if (( error = tt_face->goto_table( tt_face, tabletag, stream, 0 ) )) ++ if ( (error = fcft_face_goto_table( face, tabletag, stream )) != 0 ) + return error; + +- base_offset = FT_STREAM_POS(); ++ base_offset = FCFT_STREAM_POS(); + + /* skip version */ + +- if ( FT_STREAM_SEEK( base_offset + 4L ) || FT_FRAME_ENTER( 2L ) ) +- return error; +- +- new_offset = FT_GET_USHORT() + base_offset; +- +- FT_FRAME_EXIT(); +- +- cur_offset = FT_STREAM_POS(); +- +- if ( FT_STREAM_SEEK( new_offset ) != TT_Err_Ok ) +- return error; +- +- base_offset = FT_STREAM_POS(); ++ if ( FCFT_STREAM_SEEK( base_offset + 4L ) || ++ FCFT_READ_USHORT( new_offset ) ) ++ return error; ++ ++ new_offset += base_offset; ++ cur_offset = FCFT_STREAM_POS(); + +- if ( FT_FRAME_ENTER( 2L ) ) ++ if ( FCFT_STREAM_SEEK( new_offset ) != TT_Err_Ok ) + return error; + +- *script_count = FT_GET_USHORT(); ++ base_offset = FCFT_STREAM_POS(); + +- FT_FRAME_EXIT(); +- +- if ( FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong )) ) +- return error; ++ if ( FCFT_READ_USHORT(*script_count) || ++ FCFT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong ) ) ++ return error; + + p = 0; + for ( n = 0; n < *script_count; n++ ) + { +- if ( FT_FRAME_ENTER( 6L ) ) ++ if ( FCFT_FRAME_ENTER( 6L ) ) + goto Fail; + +- (*stags)[p] = FT_GET_ULONG(); +- new_offset = FT_GET_USHORT() + base_offset; ++ (*stags)[p] = FCFT_GET_ULONG(); ++ new_offset = FCFT_GET_USHORT() + base_offset; + +- FT_FRAME_EXIT(); ++ FCFT_FRAME_EXIT(); + +- cur_offset = FT_STREAM_POS(); ++ cur_offset = FCFT_STREAM_POS(); + +- if ( FT_STREAM_SEEK( new_offset ) ) ++ if ( FCFT_STREAM_SEEK( new_offset ) ) + goto Fail; + + if ( error == TT_Err_Ok ) +@@ -2768,7 +2755,7 @@ + else if ( error != TTO_Err_Empty_Script ) + goto Fail; + +- (void)FT_STREAM_SEEK( cur_offset ); ++ (void)FCFT_STREAM_SEEK( cur_offset ); + } + + if (!p) +@@ -2784,7 +2771,7 @@ + + Fail: + *script_count = 0; +- FT_FREE( *stags ); ++ FCFT_FREE( *stags ); + return error; + } + +@@ -2841,7 +2828,7 @@ + if (FcDebug () & FC_DBG_SCANV) + printf("complex features in this font: %s\n", complex); + bail: +- FT_FREE(gsubtags); +- FT_FREE(gpostags); ++ FCFT_FREE(gsubtags); ++ FCFT_FREE(gpostags); + return complex; + } +diff -urN fontconfig-2.3.2/src/fcftglue.c fontconfig-2.3.2-new/src/fcftglue.c +--- fontconfig-2.3.2/src/fcftglue.c 1970-01-01 01:00:00.000000000 +0100 ++++ fontconfig-2.3.2-new/src/fcftglue.c 2005-07-07 13:34:48.630254000 +0200 +@@ -0,0 +1,380 @@ ++#include "fcftglue.h" ++ ++/***************************************************************************/ ++/***************************************************************************/ ++/***** *****/ ++/***** *****/ ++/***** *****/ ++/***************************************************************************/ ++/***************************************************************************/ ++ ++/* only used internall */ ++static FT_Pointer ++fcft_qalloc( FT_Memory memory, ++ FT_ULong size, ++ FT_Error *perror ) ++{ ++ FT_Error error = 0; ++ FT_Pointer block = NULL; ++ ++ if ( size > 0 ) ++ { ++ block = memory->alloc( memory, size ); ++ if ( !block ) ++ error = FT_Err_Out_Of_Memory; ++ } ++ ++ *perror = error; ++ return block; ++} ++ ++#define FCFT_QALLOC(ptr,size) ( (ptr) = fcft_qalloc( memory, (size), &error ), error != 0 ) ++ ++ ++FCFT_APIDEF( FT_Pointer ) ++fcft_alloc( FT_Memory memory, ++ FT_ULong size, ++ FT_Error *perror ) ++{ ++ FT_Error error = 0; ++ FT_Pointer block = NULL; ++ ++ if ( size > 0 ) ++ { ++ block = memory->alloc( memory, size ); ++ if ( !block ) ++ error = FT_Err_Out_Of_Memory; ++ else ++ memset( (char*)block, 0, (size_t)size ); ++ } ++ ++ *perror = error; ++ return block; ++} ++ ++ ++FCFT_APIDEF( FT_Pointer ) ++fcft_realloc( FT_Memory memory, ++ FT_Pointer block, ++ FT_ULong old_size, ++ FT_ULong new_size, ++ FT_Error *perror ) ++{ ++ FT_Pointer block2 = NULL; ++ FT_Error error = 0; ++ ++ if ( block == NULL ) ++ { ++ block2 = fcft_alloc( memory, new_size, &error ); ++ } ++ else if ( new_size <= 0 ) ++ { ++ fcft_free( memory, block ); ++ } ++ else ++ { ++ block2 = fcft_alloc( memory, new_size, &error ); ++ if ( !error ) ++ { ++ memcpy( (char*)block2, (const char*)block, (size_t)old_size ); ++ if ( new_size > old_size ) ++ memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) ); ++ } ++ } ++ ++ if ( !error ) ++ block = block2; ++ ++ *perror = error; ++ return block; ++} ++ ++ ++FCFT_APIDEF( void ) ++fcft_free( FT_Memory memory, ++ FT_Pointer block ) ++{ ++ if ( block ) ++ memory->free( memory, block ); ++} ++ ++ ++FCFT_APIDEF( FT_Long ) ++fcft_stream_pos( FT_Stream stream ) ++{ ++ return stream->pos; ++} ++ ++ ++FCFT_APIDEF( FT_Error ) ++fcft_stream_seek( FT_Stream stream, ++ FT_Long pos ) ++{ ++ FT_Error error = 0; ++ ++ stream->pos = pos; ++ if ( stream->read ) ++ { ++ if ( stream->read( stream, pos, 0, 0 ) ) ++ error = FT_Err_Invalid_Stream_Operation; ++ } ++ else if ( pos > stream->size ) ++ error = FT_Err_Invalid_Stream_Operation; ++ ++ return error; ++} ++ ++ ++FCFT_APIDEF( FT_Error ) ++fcft_stream_frame_enter( FT_Stream stream, ++ FT_ULong count ) ++{ ++ FT_Error error = FT_Err_Ok; ++ FT_ULong read_bytes; ++ ++ if ( stream->read ) ++ { ++ /* allocate the frame in memory */ ++ FT_Memory memory = stream->memory; ++ ++ ++ if ( FCFT_QALLOC( stream->base, count ) ) ++ goto Exit; ++ ++ /* read it */ ++ read_bytes = stream->read( stream, stream->pos, ++ stream->base, count ); ++ if ( read_bytes < count ) ++ { ++ FCFT_FREE( stream->base ); ++ error = FT_Err_Invalid_Stream_Operation; ++ } ++ stream->cursor = stream->base; ++ stream->limit = stream->cursor + count; ++ stream->pos += read_bytes; ++ } ++ else ++ { ++ /* check current and new position */ ++ if ( stream->pos >= stream->size || ++ stream->pos + count > stream->size ) ++ { ++ error = FT_Err_Invalid_Stream_Operation; ++ goto Exit; ++ } ++ ++ /* set cursor */ ++ stream->cursor = stream->base + stream->pos; ++ stream->limit = stream->cursor + count; ++ stream->pos += count; ++ } ++ ++Exit: ++ return error; ++} ++ ++ ++FCFT_APIDEF( void ) ++fcft_stream_frame_exit( FT_Stream stream ) ++{ ++ if ( stream->read ) ++ { ++ FT_Memory memory = stream->memory; ++ ++ FCFT_FREE( stream->base ); ++ } ++ stream->cursor = 0; ++ stream->limit = 0; ++} ++ ++ ++FCFT_APIDEF( FT_Byte ) ++fcft_stream_get_byte( FT_Stream stream ) ++{ ++ FT_Byte result = 0; ++ ++ if ( stream->cursor < stream->limit ) ++ result = *stream->cursor++; ++ ++ return result; ++} ++ ++ ++FCFT_APIDEF( FT_Short ) ++fcft_stream_get_short( FT_Stream stream ) ++{ ++ FT_Byte* p; ++ FT_Short result = 0; ++ ++ p = stream->cursor; ++ if ( p + 2 <= stream->limit ) ++ { ++ result = (FT_Short)((p[0] << 8) | p[1]); ++ stream->cursor = p+2; ++ } ++ return result; ++} ++ ++ ++FCFT_APIDEF( FT_Long ) ++fcft_stream_get_long( FT_Stream stream ) ++{ ++ FT_Byte* p; ++ FT_Long result = 0; ++ ++ p = stream->cursor; ++ if ( p + 4 <= stream->limit ) ++ { ++ result = (FT_Long)(((FT_Long)p[0] << 24) | ++ ((FT_Long)p[1] << 16) | ++ ((FT_Long)p[2] << 8) | ++ p[3] ); ++ stream->cursor = p+4; ++ } ++ return result; ++} ++ ++ ++static FT_Error ++fcft_stream_readp( FT_Stream stream, ++ FT_Byte* *pbuffer, ++ FT_ULong count ) ++{ ++ FT_Error error = 0; ++ ++ if ( stream->read ) ++ { ++ FT_ULong read_bytes = stream->read( stream, stream->pos, *pbuffer, count ); ++ ++ if ( read_bytes != count ) ++ goto Fail; ++ ++ stream->pos += count; ++ } ++ else ++ { ++ if ( stream->pos >= stream->size || ++ stream->pos + count > stream->size ) ++ goto Fail; ++ ++ *pbuffer = stream->base + stream->pos; ++ stream->pos += count; ++ } ++ ++Exit: ++ return error; ++ ++Fail: ++ error = FT_Err_Invalid_Stream_Operation; ++ goto Exit; ++} ++ ++ ++FCFT_API( FT_Byte ) ++fcft_stream_read_byte( FT_Stream stream, ++ FT_Error *perror ) ++{ ++ FT_Byte temp[1], *p = temp, result = 0; ++ FT_Error error = fcft_stream_readp( stream, &p, 1 ); ++ ++ if ( !error ) ++ result = *p; ++ ++ return error; ++} ++ ++FCFT_API( FT_Short ) ++fcft_stream_read_short( FT_Stream stream, ++ FT_Error *perror ) ++{ ++ FT_Byte temp[2], *p = temp; ++ FT_Short result = 0; ++ FT_Error error = fcft_stream_readp( stream, &p, 2 ); ++ ++ if ( !error ) ++ result = (FT_Short)((p[0] << 8) | p[1]); ++ ++ return error; ++} ++ ++FCFT_API( FT_Long ) ++fcft_stream_read_long( FT_Stream stream, ++ FT_Error *perror ) ++{ ++ FT_Byte temp[4], *p = temp; ++ FT_Long result = 0; ++ FT_Error error = fcft_stream_readp( stream, &p, 4 ); ++ ++ if ( !error ) ++ result = (FT_Long)((FT_Long)(p[0] << 24) | ++ (FT_Long)(p[1] << 16) | ++ (p[2] << 8) | ++ p[3] ); ++ ++ return error; ++} ++ ++ ++FCFT_APIDEF( FT_Error ) ++fcft_face_goto_table( FT_Face face, ++ FT_ULong the_tag, ++ FT_Stream stream ) ++{ ++ FT_Error error; ++ ++ if ( !FT_IS_SFNT(face) ) ++ error = FT_Err_Invalid_Face_Handle; ++ else ++ { ++ /* parse the directory table directly, without using ++ * FreeType's built-in data structures ++ */ ++ FT_UInt count, nn; ++ FT_ULong offset = 0; ++ ++ if ( face->num_faces > 1 ) ++ { ++ /* deal with TrueType collections */ ++ FT_ULong offset; ++ ++ if ( FCFT_STREAM_SEEK( 12 + face->face_index*4 ) || ++ FCFT_READ_ULONG(offset) ) ++ goto Exit; ++ } ++ ++ if ( FCFT_STREAM_SEEK( offset+4 ) || ++ FCFT_READ_USHORT(count) ) ++ goto Exit; ++ ++ ++ if ( FCFT_STREAM_SEEK( offset+12 ) || ++ FCFT_FRAME_ENTER( count*16 ) ) ++ goto Exit; ++ ++ for ( nn = 0; nn < count; nn++ ) ++ { ++ FT_ULong tag = FCFT_GET_TAG(); ++ FT_ULong checksum = FCFT_GET_ULONG(); ++ FT_ULong start = FCFT_GET_ULONG(); ++ FT_ULong size = FCFT_GET_ULONG(); ++ ++ FT_UNUSED(checksum); ++ FT_UNUSED(size); ++ ++ if ( tag == the_tag ) ++ { ++ error = fcft_stream_seek( stream, offset+start ); ++ goto FoundIt; ++ } ++ } ++ error = FT_Err_Table_Missing; ++ ++ FoundIt: ++ FCFT_FRAME_EXIT(); ++ } ++ ++Exit: ++ return error; ++} ++ ++#undef FCFT_QALLOC +diff -urN fontconfig-2.3.2/src/fcftglue.h fontconfig-2.3.2-new/src/fcftglue.h +--- fontconfig-2.3.2/src/fcftglue.h 1970-01-01 01:00:00.000000000 +0100 ++++ fontconfig-2.3.2-new/src/fcftglue.h 2005-07-07 13:15:43.292717000 +0200 +@@ -0,0 +1,135 @@ ++/* the following contains code used to prevent FontConfig from ++ * abusing FreeType internals. We simply duplicate some of the FreeType ++ * functionality using only publicly defined APIs and structures ++ */ ++#ifndef __FONTCONFIG_FTGLUE_H__ ++#define __FONTCONFIG_FTGLUE_H__ ++ ++#include ++#include FT_FREETYPE_H ++ ++FT_BEGIN_HEADER ++ ++ ++/* utility macros */ ++#define FCFT_SET_ERR(c) ( (error = (c)) != 0 ) ++ ++#ifndef FCFT_API ++#define FCFT_API(x) extern x ++#endif ++ ++#ifndef FCFT_APIDEF ++#define FCFT_APIDEF(x) x ++#endif ++ ++/* stream macros used by the OpenType parser */ ++#define FCFT_STREAM_POS() fcft_stream_pos( stream ) ++#define FCFT_STREAM_SEEK(pos) FCFT_SET_ERR( fcft_stream_seek( stream, pos ) ) ++#define FCFT_FRAME_ENTER(size) FCFT_SET_ERR( fcft_stream_frame_enter( stream, size ) ) ++#define FCFT_FRAME_EXIT() fcft_stream_frame_exit( stream ) ++ ++#define FCFT_GET_BYTE() fcft_stream_get_byte( stream ) ++#define FCFT_GET_SHORT() fcft_stream_get_short( stream ) ++#define FCFT_GET_LONG() fcft_stream_get_long( stream ) ++ ++#define FCFT_GET_CHAR() ((FT_Char)FCFT_GET_BYTE()) ++#define FCFT_GET_USHORT() ((FT_UShort)FCFT_GET_SHORT()) ++#define FCFT_GET_ULONG() ((FT_ULong)FCFT_GET_LONG()) ++#define FCFT_GET_TAG() FCFT_GET_ULONG() ++ ++#define FCFT_READ_(val,type,suffix) \ ++ ( (val) = (type) fcft_stream_read_##suffix (stream, &error), error != 0 ) ++ ++#define FCFT_READ_BYTE(val) FCFT_READ_(val,FT_Byte,byte) ++#define FCFT_READ_SHORT(val) FCFT_READ_(val,FT_Short,short) ++#define FCFT_READ_LONG(val) FCFT_READ_(val,FT_Long,long) ++ ++#define FCFT_READ_CHAR(val) FCFT_READ_(val,FT_Char,byte) ++#define FCFT_READ_USHORT(val) FCFT_READ_(val,FT_UShort,short) ++#define FCFT_READ_ULONG(val) FCFT_READ_(val,FT_ULong,long) ++ ++ ++FCFT_API( FT_Long ) ++fcft_stream_pos( FT_Stream stream ); ++ ++FCFT_API( FT_Error ) ++fcft_stream_seek( FT_Stream stream, ++ FT_Long pos ); ++ ++FCFT_API( FT_Error ) ++fcft_stream_frame_enter( FT_Stream stream, ++ FT_ULong size ); ++ ++FCFT_API( void ) ++fcft_stream_frame_exit( FT_Stream stream ); ++ ++FCFT_API( FT_Byte ) ++fcft_stream_get_byte( FT_Stream stream ); ++ ++FCFT_API( FT_Short ) ++fcft_stream_get_short( FT_Stream stream ); ++ ++FCFT_API( FT_Long ) ++fcft_stream_get_long( FT_Stream stream ); ++ ++FCFT_API( FT_Byte ) ++fcft_stream_read_byte( FT_Stream stream, ++ FT_Error *perror ); ++ ++FCFT_API( FT_Short ) ++fcft_stream_read_short( FT_Stream stream, ++ FT_Error *perror ); ++ ++FCFT_API( FT_Long ) ++fcft_stream_read_long( FT_Stream stream, ++ FT_Error *perror ); ++ ++FCFT_API( FT_Error ) ++fcft_face_goto_table( FT_Face face, ++ FT_ULong tag, ++ FT_Stream stream ); ++ ++/* memory macros used by the OpenType parser */ ++#define FCFT_MEM_ALLOC(_ptr,_size) \ ++ ( (_ptr) = fcft_alloc( memory, _size, &error ), error != 0 ) ++ ++#define FCFT_MEM_REALLOC(_ptr,_oldsz,_newsz) \ ++ ( (_ptr) = fcft_realloc( memory, (_ptr), (_oldsz), (_newsz), &error ), error != 0 ) ++ ++#define FCFT_FREE(_ptr) \ ++ FT_BEGIN_STMNT \ ++ if ( (_ptr) ) \ ++ { \ ++ fcft_free( memory, _ptr ); \ ++ _ptr = NULL; \ ++ } \ ++ FT_END_STMNT ++ ++#define FCFT_MEM_ALLOC_ARRAY(_ptr,_count,_type) \ ++ FCFT_MEM_ALLOC(_ptr,(_count)*sizeof(_type)) ++ ++#define FCFT_MEM_REALLOC_ARRAY(_ptr,_oldcnt,_newcnt,_type) \ ++ FCFT_MEM_REALLOC(_ptr,(_oldcnt)*sizeof(_type),(_newcnt)*sizeof(_type)) ++ ++ ++FCFT_API( FT_Pointer ) ++fcft_alloc( FT_Memory memory, ++ FT_ULong size, ++ FT_Error *perror ); ++ ++FCFT_API( FT_Pointer ) ++fcft_realloc( FT_Memory memory, ++ FT_Pointer block, ++ FT_ULong old_size, ++ FT_ULong new_size, ++ FT_Error *perror ); ++ ++FCFT_API( void ) ++fcft_free( FT_Memory memory, ++ FT_Pointer block ); ++ ++/* */ ++ ++FT_END_HEADER ++ ++#endif /* __OPENTYPE_FCFT_H__ */ +diff -urN fontconfig-2.3.2/src/Makefile.am fontconfig-2.3.2-new/src/Makefile.am +--- fontconfig-2.3.2/src/Makefile.am 2004-12-05 06:49:20.000000000 +0100 ++++ fontconfig-2.3.2-new/src/Makefile.am 2005-07-07 13:09:15.416637082 +0200 +@@ -86,6 +86,7 @@ + fcdefault.c \ + fcdir.c \ + fcfreetype.c \ ++ fcftglue.c \ + fcfs.c \ + fcinit.c \ + fclang.c \ +diff -urN fontconfig-2.3.2/src/Makefile.in fontconfig-2.3.2-new/src/Makefile.in +--- fontconfig-2.3.2/src/Makefile.in 2005-04-27 21:08:51.000000000 +0200 ++++ fontconfig-2.3.2-new/src/Makefile.in 2005-07-07 13:09:15.417636939 +0200 +@@ -228,6 +228,7 @@ + fcdefault.c \ + fcdir.c \ + fcfreetype.c \ ++ fcftglue.c \ + fcfs.c \ + fcinit.c \ + fclang.c \ +@@ -257,7 +258,7 @@ + libfontconfig_la_DEPENDENCIES = + am_libfontconfig_la_OBJECTS = fcatomic.lo fcblanks.lo fccache.lo \ + fccfg.lo fccharset.lo fcdbg.lo fcdefault.lo fcdir.lo \ +- fcfreetype.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \ ++ fcfreetype.lo fcftglue.lo fcfs.lo fcinit.lo fclang.lo fclist.lo fcmatch.lo \ + fcmatrix.lo fcname.lo fcpat.lo fcstr.lo fcxml.lo + libfontconfig_la_OBJECTS = $(am_libfontconfig_la_OBJECTS) + --- fontconfig-2.3.2.orig/debian/patches/01_alias_dingbats_symbol.patch +++ fontconfig-2.3.2/debian/patches/01_alias_dingbats_symbol.patch @@ -0,0 +1,20 @@ +diff -Nur fontconfig-2.3.2/fonts.conf.in fontconfig-2.3.2.new/fonts.conf.in +--- fontconfig-2.3.2/fonts.conf.in 2006-03-31 17:54:08.000000000 +0200 ++++ fontconfig-2.3.2.new/fonts.conf.in 2006-03-31 17:56:33.000000000 +0200 +@@ -160,6 +160,16 @@ + Courier New + Cumberland AMT + ++ ++ ++ ZapfDingbats ++ Dingbats ++ ++ ++ ++ Symbol ++ Open Symbols L ++ + + ++ language-selector.conf ++ ++ + --- fontconfig-2.3.2.orig/debian/patches/03_preferred_symbol_font.patch +++ fontconfig-2.3.2/debian/patches/03_preferred_symbol_font.patch @@ -0,0 +1,21 @@ +--- fonts.conf.in.orig 2006-04-13 11:32:59.000000000 +0200 ++++ fonts.conf.in 2006-04-13 11:35:05.000000000 +0200 +@@ -144,6 +144,18 @@ + + + ++ ++ ++ Symbol ++ ++ ++ Standard Symbols L ++ ++ ++ ++ + --- fontconfig-2.3.2.orig/debian/patches/kubuntu_01_fccfg_c.diff +++ fontconfig-2.3.2/debian/patches/kubuntu_01_fccfg_c.diff @@ -0,0 +1,10 @@ +--- src/fccfg.c.sav 2006-01-02 16:44:39.000000000 +0100 ++++ src/fccfg.c 2006-01-02 16:45:28.000000000 +0100 +@@ -823,6 +823,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr * + r = FcPatternGet (p, e->u.field, 0, &v); + if (r != FcResultMatch) + v.type = FcTypeVoid; ++ v = FcValueSave (v); + break; + case FcOpConst: + if (FcNameConstant (e->u.constant, &v.u.i)) --- fontconfig-2.3.2.orig/debian/copyright +++ fontconfig-2.3.2/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Colin Walters on +Sun, 13 Oct 2002 15:01:50 -0400 + +It was downloaded from http://www.fontconfig.org/ + +Upstream Author: Keith Packard + +Copyright: + +Copyright © 2001,2003 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + --- fontconfig-2.3.2.orig/debian/fontconfig.install +++ fontconfig-2.3.2/debian/fontconfig.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/fc-* --- fontconfig-2.3.2.orig/debian/fontconfig-config.install +++ fontconfig-2.3.2/debian/fontconfig-config.install @@ -0,0 +1,2 @@ +debian/tmp/etc/fonts/fonts.* +debian/tmp/etc/fonts/conf.d/* --- fontconfig-2.3.2.orig/debian/fontconfig.preinst +++ fontconfig-2.3.2/debian/fontconfig.preinst @@ -0,0 +1,39 @@ +#! /bin/sh + +set -e + +# Prepare to move a conffile without triggering a dpkg question +prep_mv_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" = "$old_md5sum" ]; then + rm -f "$CONFFILE" + fi + fi +} + +FILES="\ +/etc/fonts/fonts.conf \ +/etc/fonts/fonts.dtd \ +/etc/fonts/conf.d/autohint.conf \ +/etc/fonts/conf.d/no-bitmaps.conf \ +/etc/fonts/conf.d/no-sub-pixel.conf \ +/etc/fonts/conf.d/sub-pixel.conf \ +/etc/fonts/conf.d/unhinted.conf \ +/etc/fonts/conf.d/yes-bitmaps.conf" + +NEWVERSION=2.3.2-2 + +case "$1" in +install|upgrade) + if [ -n "$2" ] && dpkg --compare-versions "$2" lt "$NEWVERSION"; then + for FILE in $FILES; do + prep_mv_conffile $FILE + done + fi +esac + +#DEBHELPER# --- fontconfig-2.3.2.orig/debian/fontconfig.defoma +++ fontconfig-2.3.2/debian/fontconfig.defoma @@ -0,0 +1,162 @@ +# -*- perl -*- +# Defoma configuration script for fontconfig +# Copyright © 2003 Angus Lees +# This file is hereby placed into the public domain. + +@ACCEPT_CATEGORIES = qw(type1 truetype cid); +# .. and any other categories supported by freetype + +package fontconfig; + +use Debian::Defoma::Common; +use Debian::Defoma::Id; +use Debian::Defoma::Subst; + +use strict; +use warnings; + +my $PkgDir = "$ROOTDIR/fontconfig.d"; +my ($Id, $Sb); + +sub init { + $Id ||= defoma_id_open_cache() or return 1; + $Sb ||= defoma_subst_open(rulename => 'fontconfig', + threshold => 70, + idobject => $Id) or return 1; + + return 0; +} + +sub register { + my $font = shift; + my $hints = parse_hints_start(@_); + + return 1 unless $hints->{FontName}; + + my $priority = $hints->{Priority} || 20; + my ($fontname) = split / +/, $hints->{FontName}; + my @alias = split / +/, $hints->{Alias} if $hints->{Alias}; + + defoma_id_register($Id, type => 'real', font => $font, + id => $fontname, priority => $priority, + hints => join(' ', @_)); + + foreach my $alias (@alias) { + defoma_id_register($Id, type => 'alias', font => $font, + id => $alias, priority => $priority, + origin => $fontname); + } + + defoma_subst_register($Sb, $font, $fontname); + + return 0; +} + +sub unregister { + my $font = shift; + defoma_subst_unregister($Sb, $font); + defoma_id_unregister($Id, type => 'alias', font => $font); + defoma_id_unregister($Id, type => 'real', font => $font); + return 0; +} + +sub do_install_real { + my $font = shift; + my $id = shift; + + my $dir = $PkgDir . '/' . substr($id, 0, 1); + my $ext = $font =~ m|\.([^/.]+)$| ? ".$1" : ''; + my $file = $id . $ext; + + mkdir $dir; + symlink $font, "$dir/$file" or return 1; + + return 0; +} + +sub do_remove_real { + my $font = shift; + my $id = shift; + + my $dir = $PkgDir . '/' . substr($id, 0, 1); + my $ext = $font =~ m|\.([^/.]+)$| ? ".$1" : ''; + my $file = $id . $ext; + + unlink "$dir/$file" or return 1; + rmdir $dir; # ignore failure + + return 0; +} + +sub term { + return unless $Id; + + open my $fh, '>', "$PkgDir/fonts.conf" or return 1; + + print $fh < + + + + $PkgDir +EOF + + # aliases + foreach (defoma_id_get_font($Id, installed => type => 'SaI')) { + print $fh < + $Id->{e_id}->[$_] + $Id->{e_depid}->[$_] + +EOF + } + + # substituded fonts + foreach (defoma_id_get_font($Id, installed => type => 'SSI')) { + print $fh < + $Id->{e_id}->[$_] + $Id->{e_depid}->[$_] + +EOF + } + + print $fh "\n"; + + close $fh; + + defoma_subst_close($Sb); + defoma_id_close_cache($Id); + + system('fc-cache', $PkgDir); + + return 0; +} + +sub main { + my $cmd = shift; + + if ($cmd eq 'init') { + init(); + } elsif ($cmd eq 'register') { + return register(@_); + } elsif ($cmd eq 'unregister') { + return unregister(@_); + } elsif ($cmd eq 'do-install-real') { + return do_install_real(@_); + } elsif ($cmd eq 'do-remove-real') { + return do_remove_real(@_); + } elsif ($cmd eq 'term') { + return term(@_); + } + + 0; +} + +no warnings; + +*truetype = \&main; +*type1 = \&main; +*cid = \&main; + +1; --- fontconfig-2.3.2.orig/debian/control +++ fontconfig-2.3.2/debian/control @@ -0,0 +1,98 @@ +Source: fontconfig +Section: libs +Priority: optional +Maintainer: Keith Packard +Uploaders: Josselin Mouette +Build-Depends: cdbs (>= 0.4.5.4), debhelper (>= 5.0.22), libfreetype6-dev (>= 2.1.7), libexpat1-dev, defoma (>= 0.7.0), binutils (>= 2.12.90.0.9) +Standards-Version: 3.7.2 + +Package: fontconfig +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, defoma (>= 0.7.0), fontconfig-config +Description: generic font configuration library - support binaries + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + Fontconfig is not a rasterization library, nor does it impose a + particular rasterization library on the application. The X-specific + library 'Xft' uses fontconfig along with freetype to specify and + rasterize fonts. + . + This package contains a program to maintain the fontconfig cache + (fc-cache), a sample program to list installed fonts (fc-list), and + a program to test the matching rules (fc-match). It also makes fonts + managed by defoma available to fontconfig applications. + +Package: fontconfig-config +Section: libs +Architecture: all +Depends: ${misc:Depends}, ucf (>= 0.29), ttf-dejavu | ttf-bitstream-vera | ttf-freefont | gsfonts-x11 | msttcorefonts +Replaces: fontconfig (<< 2.3.2-2) +Conflicts: fontconfig (<< 2.3.2-2) +Description: generic font configuration library - configuration + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the configuration files and scripts for fontconfig. + +Package: fontconfig-udeb +Section: debian-installer +XC-Package-Type: udeb +Architecture: any +Priority: extra +Depends: ${shlibs:Depends} +Description: generic font configuration library - minimal runtime + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the minimal runtime library and configuration for + use by the debian-installer software. + +Package: libfontconfig1-dev +Section: libdevel +Architecture: any +Depends: libfontconfig1 (= ${Source-Version}), libexpat1-dev, libfreetype6-dev (>= 2.1.7), pkg-config +Provides: libfontconfig-dev +Description: generic font configuration library - development + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the static libraries and headers needed for the + development of applications using fontconfig. + +Package: libfontconfig1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, fontconfig-config (= ${Source-Version}) +Description: generic font configuration library - runtime + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the runtime library needed to launch applications + using fontconfig. + +Package: libfontconfig1-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libfontconfig1 (= ${Source-Version}) +Description: generic font configuration library - debugging symbols + Fontconfig is a font configuration and customization library, which + does not depend on the X Window System. It is designed to locate + fonts within the system and select them according to requirements + specified by applications. + . + This package contains the debugging symbols associated with + libfontconfig1. They will automatically be used by gdb for debugging + fontconfig-related issues. --- fontconfig-2.3.2.orig/debian/rules +++ fontconfig-2.3.2/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters + +# This ensures the fontconfig package is built after libfontconfig1 +binary/fontconfig:: binary/libfontconfig1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-docs --with-add-fonts=/usr/share/X11/fonts,/usr/local/share/fonts + +# tight versioning +DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.3.0)" --add-udeb="fontconfig-udeb" + +DEB_SHLIBDEPS_LIBRARY_fontconfig := libfontconfig1 +DEB_SHLIBDEPS_INCLUDE_fontconfig := debian/libfontconfig1/usr/lib/ + +DEB_DH_STRIP_ARGS := --dbg-package=libfontconfig1 + +DEB_MAKE_ENVVARS := LC_ALL=C + +clean:: + chmod +w debian/po/*.po + debconf-updatepo + rm -f config/Makedefs Makefile {src,fontconfig}/Makefile fc-{cache,list}/Makefile fontconfig-config fontconfig.pc config.h + +# defoma stuff +binary-post-install/fontconfig:: + dh_installdefoma