diff -Nru fontconfig-2.10.93/Makefile.am fontconfig-2.11.0/Makefile.am --- fontconfig-2.10.93/Makefile.am 2013-04-04 03:09:45.000000000 +0000 +++ fontconfig-2.11.0/Makefile.am 2013-10-11 03:10:16.000000000 +0000 @@ -90,12 +90,14 @@ .PHONY: ChangeLog +FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR)) + fonts.conf: fonts.conf.in Makefile sed \ -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ - -e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \ + -e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \ -e 's,@PACKAGE\@,$(PACKAGE),g' \ -e 's,@VERSION\@,$(VERSION),g' \ $(srcdir)/$@.in > $@.tmp && \ diff -Nru fontconfig-2.10.93/Makefile.in fontconfig-2.11.0/Makefile.in --- fontconfig-2.10.93/Makefile.in 2013-05-20 08:44:34.000000000 +0000 +++ fontconfig-2.11.0/Makefile.in 2013-10-11 04:28:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -75,12 +103,13 @@ host_triplet = @host@ @ENABLE_DOCS_TRUE@am__append_1 = doc subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \ - $(srcdir)/fontconfig.spec.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/fontconfig.spec.in \ + $(srcdir)/fontconfig.pc.in $(srcdir)/fontconfig-zip.in COPYING \ + compile config.guess config.sub depcomp install-sh missing \ + ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ @@ -110,13 +139,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -153,9 +183,30 @@ DATA = $(pkgconfig_DATA) $(xml_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -287,6 +338,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -316,7 +369,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = $(BASECONFIGDIR) bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -324,7 +376,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = $(CONFIGDIR) datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -358,11 +409,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = $(XMLDIR) SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src fc-cache fc-cat \ fc-list fc-match fc-pattern fc-query fc-scan fc-validate \ conf.d test $(am__append_1) @@ -382,9 +431,13 @@ $(srcdir)/test-driver `find "$(srcdir)" -type f -name \ Makefile.in -print` $(srcdir)/ChangeLog pkgconfig_DATA = fontconfig.pc +baseconfigdir = $(BASECONFIGDIR) +configdir = $(CONFIGDIR) +xmldir = $(XMLDIR) xml_DATA = fonts.dtd @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)" @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false +FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR)) DISTCHECK_CONFIGURE_FLAGS = all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -503,14 +556,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -531,31 +583,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -571,12 +605,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -588,15 +617,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -605,18 +630,16 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -749,9 +772,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -926,19 +949,16 @@ uninstall-am: uninstall-local uninstall-pkgconfigDATA \ uninstall-xmlDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-cscope \ - clean-generic clean-libtool cscope cscopelist \ - cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ @@ -946,8 +966,8 @@ install-xmlDATA installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-local uninstall-pkgconfigDATA uninstall-xmlDATA + ps ps-am tags tags-am uninstall uninstall-am uninstall-local \ + uninstall-pkgconfigDATA uninstall-xmlDATA ChangeLog: $(srcdir)/ChangeLog $(srcdir)/ChangeLog: @@ -970,7 +990,7 @@ -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ - -e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \ + -e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \ -e 's,@PACKAGE\@,$(PACKAGE),g' \ -e 's,@VERSION\@,$(VERSION),g' \ $(srcdir)/$@.in > $@.tmp && \ diff -Nru fontconfig-2.10.93/README fontconfig-2.11.0/README --- fontconfig-2.10.93/README 2013-05-20 08:42:34.000000000 +0000 +++ fontconfig-2.11.0/README 2013-10-11 04:27:33.000000000 +0000 @@ -1,12 +1,76 @@ Fontconfig Font configuration and customization library - Version 2.10.93 (2.11 RC3) - 2013-05-20 + Version 2.11 + 2013-10-11 Check INSTALL for compilation and installation instructions. Report bugs to https://bugs.freedesktop.org in the fontconfig module. +2.11 + +Akira TAGOH (15): + Do not create a config dir for migration when no config files nor dirs + Add a test case of the migration for config place + Fix memory leaks in FcFreeTypeQueryFace + Bug 68955 - Deprecate / remove FC_RASTERIZER + Copy all values from the font to the pattern if the pattern doesn't have the element + Fix a crash when FcPattern is set to null on FcFontSetList() and FcFontList() + Add the description of -q option to the man page + avoid reading config.h twice + clean up + Add the relative path for to fonts.conf if the parent path is same to fonts.conf + Workaround the race condition issue on updating cache + exit with the error code when FcNameParse() failed + Add missing doc for FcStrListFirst and fix a typo + Bump libtool revision + Update CaseFolding.txt to Unicode 6.3 + +Jan Alexander Steffens (heftig) (1): + Further changes to 30-metric-aliases.conf + +W. Trevor King (1): + doc/fccharset.fncs: Describe the map format in more detail + +2.10.95 (2.11 RC5) + +Akira TAGOH (2): + Fix a typo + Fix a crash + +2.10.94 (2.11 RC4) + +Akira TAGOH (25): + Bug 64906 - FcNameParse() should ignore leading whitespace in parameters + Fix a comparison of constant warning with clang + Fix a shift count overflow on 32bit box + Fix a incompatible pointer warning on NetBSD + Add FcTypeUnknown to FcType to avoid comparison of constant -1 + Fix the behavior of intermixed tests end edits in match + Ignore scandir() check on mingw + Use INT_MAX instead of unreliable hardcoding value + Add FC_UNUSED to FC_ASSERT_STATIC macro to avoid compiler warning + Rework to apply the intermixed test and edit elements in one-pass + trivial code optimization + Correct fontconfig.pc to add certain dependencies for build + Correct fontconfig.pc to add certain dependencies for static build + Fix wrong edit position + Bug 67809 - Invalid read/write with valgrind when assigning something twice + warn deprecated only when migration failed + Bug 67845 - Match on FC_SCALABLE + Bug 16818 - fontformat in match pattern is not respected? + Bug 68340 - More metric compat fonts + Bug 63399 - Add default aliases for Georgia, Garamond, Palatino Linotype, Trebuchet MS + Fix a typo + Fix a crash when non-builtin objects are edited + Fix a wrong edit position when 'kind' is different + Bug 68587 - copy qu.orth to quz.orth + Add quz.orth to Makefile.am + +Behdad Esfahbod (2): + Minor + Fix assertion + 2.10.93 (2.11 RC3) Akira TAGOH (10): diff -Nru fontconfig-2.10.93/aclocal.m4 fontconfig-2.11.0/aclocal.m4 --- fontconfig-2.10.93/aclocal.m4 2013-05-20 08:44:33.000000000 +0000 +++ fontconfig-2.11.0/aclocal.m4 2013-10-11 04:28:46.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -219,24 +220,22 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file 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. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.12' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.2], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -252,21 +251,19 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.2])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to # '$srcdir', '$srcdir/..', or '$srcdir/../..'. @@ -314,14 +311,12 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file 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. -# serial 10 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -347,13 +342,12 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file 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. -# serial 17 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -539,19 +533,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file 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. -# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -580,7 +573,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -616,14 +609,12 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file 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. -# serial 19 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -639,7 +630,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -669,8 +660,7 @@ dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -724,18 +714,15 @@ [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl @@ -769,14 +756,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -792,14 +777,12 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -815,14 +798,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -867,14 +848,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file 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. -# serial 7 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -882,11 +861,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -899,8 +877,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) @@ -909,14 +887,12 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -942,14 +918,12 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file 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. -# serial 9 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -1025,14 +999,12 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file 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. -# serial 3 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT @@ -1087,14 +1059,12 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file 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. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor 'install' (even GNU) is that you can't @@ -1117,14 +1087,12 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file 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. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1138,14 +1106,12 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file 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. -# serial 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. @@ -1159,76 +1125,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru fontconfig-2.10.93/compile fontconfig-2.11.0/compile --- fontconfig-2.10.93/compile 1970-01-01 00:00:00.000000000 +0000 +++ fontconfig-2.11.0/compile 2013-06-17 09:16:35.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru fontconfig-2.10.93/conf.d/30-metric-aliases.conf fontconfig-2.11.0/conf.d/30-metric-aliases.conf --- fontconfig-2.10.93/conf.d/30-metric-aliases.conf 2013-04-04 03:09:45.000000000 +0000 +++ fontconfig-2.11.0/conf.d/30-metric-aliases.conf 2013-10-11 03:10:16.000000000 +0000 @@ -2,57 +2,46 @@ - +Alias similar/metric-compatible families from various sources: + +PostScript fonts: URW fonts: GUST fonts: Windows fonts: +====================== ==================== ================= ================== +Helvetica Nimbus Sans L TeX Gyre Heros +Helvetica Condensed TeX Gyre Heros Cn +Times Nimbus Roman No9 L TeX Gyre Termes +Courier Nimbus Mono L TeX Gyre Cursor +ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor +ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style +ITC Zapf Chancery URW Chancery L TeX Gyre Chorus +Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype +New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook + +Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: +================ ====================== ======================= ================= ============== +Arial Liberation Sans Arimo Albany Albany AMT +Arial Narrow Liberation Sans Narrow +Times New Roman Liberation Serif Cousine Thorndale Thorndale AMT +Courier New Liberation Mono Tinos Cumberland Cumberland AMT + +Microsoft fonts: Other fonts: +================ ============ +Georgia Gelasio + +We want for each of them to fallback to any of these available, +but in an order preferring similar designs first. We do this in three steps: + +1) Alias each specific to its generic family. + e.g. Liberation Sans to Arial + +2) Weak alias each generic to the other generic of its family. + e.g. Arial to Helvetica + +3) Alias each generic to its specifics. + e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT + +--> @@ -65,6 +54,20 @@ + TeX Gyre Heros + + Helvetica + + + + + TeX Gyre Heros Cn + + Helvetica Condensed + + + + Nimbus Roman No9 L Times @@ -72,12 +75,138 @@ + TeX Gyre Termes + + Times + + + + Nimbus Mono L Courier + + TeX Gyre Cursor + + Courier + + + + + Avant Garde + + ITC Avant Garde Gothic + + + + + URW Gothic L + + ITC Avant Garde Gothic + + + + + TeX Gyre Adventor + + ITC Avant Garde Gothic + + + + + Bookman + + ITC Bookman + + + + + URW Bookman L + + ITC Bookman + + + + + TeX Gyre Bonum + + ITC Bookman + + + + + Bookman Old Style + + ITC Bookman + + + + + Zapf Chancery + + ITC Zapf Chancery + + + + + URW Chancery L + + ITC Zapf Chancery + + + + + TeX Gyre Chorus + + ITC Zapf Chancery + + + + + URW Palladio L + + Palatino + + + + + TeX Gyre Pagella + + Palatino + + + + + Palatino Linotype + + Palatino + + + + + Century Schoolbook L + + New Century Schoolbook + + + + + TeX Gyre Schola + + New Century Schoolbook + + + + + Century Schoolbook + + New Century Schoolbook + + + @@ -171,11 +300,17 @@ + + Gelasio + + Georgia + + + - Helvetica @@ -185,6 +320,13 @@ + Helvetica Condensed + + Arial Narrow + + + + Times Times New Roman @@ -208,6 +350,13 @@ + Arial Narrow + + Helvetica Condensed + + + + Times New Roman Times @@ -225,18 +374,26 @@ - Helvetica + TeX Gyre Heros Nimbus Sans L + Helvetica Condensed + + TeX Gyre Heros Cn + + + + Times + TeX Gyre Termes Nimbus Roman No9 L @@ -244,10 +401,53 @@ Courier + TeX Gyre Cursor Nimbus Mono L + + ITC Avant Garde Gothic + + TeX Gyre Adventor + URW Gothic L + + + + + ITC Bookman + + Bookman Old Style + TeX Gyre Bonum + URW Bookman L + + + + + ITC Zapf Chancery + + TeX Gyre Chorus + URW Chancery L + + + + + Palatino + + Palatino Linotype + TeX Gyre Pagella + URW Palladio L + + + + + New Century Schoolbook + + Century Schoolbook + TeX Gyre Schola + Century Schoolbook L + + @@ -287,5 +487,11 @@ + + Georgia + + Gelasio + + diff -Nru fontconfig-2.10.93/conf.d/30-urw-aliases.conf fontconfig-2.11.0/conf.d/30-urw-aliases.conf --- fontconfig-2.10.93/conf.d/30-urw-aliases.conf 2012-07-24 02:01:32.000000000 +0000 +++ fontconfig-2.11.0/conf.d/30-urw-aliases.conf 2013-10-11 03:10:16.000000000 +0000 @@ -3,30 +3,14 @@ - Avant Garde - URW Gothic L - - - Bookman - URW Bookman L - - - New Century Schoolbook - Century Schoolbook L - - - Palatino - URW Palladio L - - - Zapf Chancery - URW Chancery L + Zapf Dingbats + Dingbats - Zapf Dingbats + ITC Zapf Dingbats Dingbats diff -Nru fontconfig-2.10.93/conf.d/45-latin.conf fontconfig-2.11.0/conf.d/45-latin.conf --- fontconfig-2.10.93/conf.d/45-latin.conf 2012-06-01 02:26:09.000000000 +0000 +++ fontconfig-2.11.0/conf.d/45-latin.conf 2013-10-11 03:10:16.000000000 +0000 @@ -45,6 +45,22 @@ Thorndale serif + + Georgia + serif + + + Garamond + serif + + + Palatino Linotype + serif + + + Trebuchet MS + serif + diff -Nru fontconfig-2.10.93/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am --- fontconfig-2.10.93/conf.d/Makefile.am 2013-05-13 03:10:36.000000000 +0000 +++ fontconfig-2.11.0/conf.d/Makefile.am 2013-10-11 03:10:17.000000000 +0000 @@ -45,7 +45,7 @@ EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) -configdir=$(CONFIGDIR) +configdir = $(CONFIGDIR) config_DATA = $(DOC_FILES) templatedir = $(TEMPLATEDIR) diff -Nru fontconfig-2.10.93/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in --- fontconfig-2.10.93/conf.d/Makefile.in 2013-05-20 08:44:34.000000000 +0000 +++ fontconfig-2.11.0/conf.d/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -74,7 +102,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = conf.d -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ @@ -136,6 +164,7 @@ } am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(templatedir)" DATA = $(config_DATA) $(template_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -220,6 +249,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -249,7 +280,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -257,7 +287,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = $(CONFIGDIR) datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -291,11 +320,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = $(TEMPLATEDIR) top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ BUILT_SOURCES = README DOC_SOURCES = README.in DOC_FILES = $(DOC_SOURCES:.in=) @@ -318,7 +345,9 @@ EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) +configdir = $(CONFIGDIR) config_DATA = $(DOC_FILES) +templatedir = $(TEMPLATEDIR) template_DATA = \ 10-autohint.conf \ 10-no-sub-pixel.conf \ @@ -432,11 +461,9 @@ @list='$(template_DATA)'; test -n "$(templatedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(templatedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -583,17 +610,18 @@ .MAKE: all check install install-am install-data-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-configDATA install-data install-data-am \ - install-data-hook install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-templateDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-configDATA uninstall-local uninstall-templateDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-configDATA install-data \ + install-data-am install-data-hook install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-templateDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am uninstall-configDATA \ + uninstall-local uninstall-templateDATA README: $(srcdir)/README.in diff -Nru fontconfig-2.10.93/config.guess fontconfig-2.11.0/config.guess --- fontconfig-2.10.93/config.guess 2012-09-26 14:03:18.000000000 +0000 +++ fontconfig-2.11.0/config.guess 2013-06-17 09:16:35.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-06-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < header file. */ #undef HAVE_SCHED_H diff -Nru fontconfig-2.10.93/config.sub fontconfig-2.11.0/config.sub --- fontconfig-2.10.93/config.sub 2012-09-26 14:03:18.000000000 +0000 +++ fontconfig-2.11.0/config.sub 2013-06-17 09:16:35.000000000 +0000 @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. - -timestamp='2012-04-18' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-04-24' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see . @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +252,10 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,9 +786,13 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1004,7 +1006,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1586,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru fontconfig-2.10.93/configure fontconfig-2.11.0/configure --- fontconfig-2.10.93/configure 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/configure 2013-10-11 04:28:48.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for fontconfig 2.10.93. +# Generated by GNU Autoconf 2.69 for fontconfig 2.11.0. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig +$0: https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -591,9 +591,9 @@ # Identity of this package. PACKAGE_NAME='fontconfig' PACKAGE_TARNAME='fontconfig' -PACKAGE_VERSION='2.10.93' -PACKAGE_STRING='fontconfig 2.10.93' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig' +PACKAGE_VERSION='2.11.0' +PACKAGE_STRING='fontconfig 2.11.0' +PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig' PACKAGE_URL='' # Factoring default headers for most tests. @@ -637,6 +637,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +PKGCONFIG_REQUIRES_PRIVATELY +PKGCONFIG_REQUIRES DOCMAN3 ENABLE_DOCS_FALSE ENABLE_DOCS_TRUE @@ -650,13 +652,9 @@ PTHREAD_CC ax_pthread_config XMLDIR -xmldir CONFIGDIR -configdir BASECONFIGDIR -baseconfigdir TEMPLATEDIR -templatedir FC_FONTDATE FC_CACHEDIR fc_cachedir @@ -1399,7 +1397,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fontconfig 2.10.93 to adapt to many kinds of systems. +\`configure' configures fontconfig 2.11.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1467,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fontconfig 2.10.93:";; + short | recursive ) echo "Configuration of fontconfig 2.11.0:";; esac cat <<\_ACEOF @@ -1559,7 +1557,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1622,7 +1620,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fontconfig configure 2.10.93 +fontconfig configure 2.11.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1782,7 +1780,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ( $as_echo "## ---------------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig ## +## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig ## ## ---------------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; @@ -2285,7 +2283,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fontconfig $as_me 2.10.93, which was +It was created by fontconfig $as_me 2.11.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2636,7 +2634,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.12' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2849,8 +2847,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -3090,6 +3088,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3112,7 +3149,7 @@ # Define the identity of the package. PACKAGE='fontconfig' - VERSION='2.10.93' + VERSION='2.11.0' cat >>confdefs.h <<_ACEOF @@ -3152,12 +3189,17 @@ # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3199,11 +3241,11 @@ -LIBT_CURRENT=8 +LIBT_CURRENT=9 LIBT_REVISION=0 -LIBT_AGE=7 +LIBT_AGE=8 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE" @@ -3211,6 +3253,9 @@ LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` +PKGCONFIG_REQUIRES= +PKGCONFIG_REQUIRES_PRIVATELY= + ac_config_headers="$ac_config_headers config.h" @@ -13903,6 +13948,64 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +if test "$os_win32" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for scandir" >&5 +$as_echo_n "checking for scandir... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + int comp(const struct dirent **, const struct dirent **); + int comp(const struct dirent **a, const struct dirent **b) { return 0; } + int main(void) { + struct dirent **d; + return scandir(".", &d, 0, &comp) >= 0; + } + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_SCANDIR 1" >>confdefs.h + + +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + int comp(const void *, const void *); + int comp(const void *a, const void *b) { return 0; } + int main(void) { + struct dirent **d; + return scandir(".", &d, 0, &comp) >= 0; + } + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_SCANDIR_VOID_P 1" >>confdefs.h + + +else + + as_fn_error $? " +*** No scandir function available." "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi CFLAGS="$fc_saved_CFLAGS" # @@ -14079,6 +14182,9 @@ if ac_fn_c_try_link "$LINENO"; then : iconv_type="libiconv" use_iconv=1 + ICONV_CFLAGS="$libiconv_cflags" + ICONV_LIBS="$libiconv_libs" + else use_iconv=0 fi @@ -14087,8 +14193,6 @@ CFLAGS="$iconvsaved_CFLAGS" LIBS="$iconvsaved_LIBS" - ICONV_CFLAGS="$libiconv_cflags" - ICONV_LIBS="$libiconv_libs" fi if test "x$use_iconv" = "x0"; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14217,6 +14321,7 @@ $as_echo "yes" >&6; } fi +PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2" @@ -14374,6 +14479,8 @@ else EXPAT_LIBS="-lexpat" fi + else + PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY expat" fi expatsaved_CPPFLAGS="$CPPFLAGS" @@ -14530,6 +14637,7 @@ $as_echo "yes" >&6; } fi + PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY libxml-2.0" cat >>confdefs.h <<_ACEOF #define ENABLE_LIBXML2 1 @@ -14758,7 +14866,7 @@ esac case "$configdir" in no|yes) - configdir='${baseconfigdir}'/conf.d + configdir='${BASECONFIGDIR}'/conf.d ;; *) ;; @@ -14782,10 +14890,6 @@ - - - - # # Thread-safety primitives # @@ -15750,6 +15854,9 @@ + + + ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" cat >confcache <<\_ACEOF @@ -16311,7 +16418,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fontconfig $as_me 2.10.93, which was +This file was extended by fontconfig $as_me 2.11.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16371,13 +16478,13 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -fontconfig config.status 2.10.93 +fontconfig config.status 2.11.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17424,7 +17531,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -17475,7 +17582,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff -Nru fontconfig-2.10.93/configure.ac fontconfig-2.11.0/configure.ac --- fontconfig-2.10.93/configure.ac 2013-05-20 08:42:34.000000000 +0000 +++ fontconfig-2.11.0/configure.ac 2013-10-11 04:27:42.000000000 +0000 @@ -33,7 +33,7 @@ dnl version. This same version number must appear in fontconfig/fontconfig.h dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from fontconfig.h -AC_INIT([fontconfig], [2.10.93], [https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig]) +AC_INIT([fontconfig], [2.11.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig]) AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -42,11 +42,11 @@ dnl bump revision when fixing bugs dnl bump current and age, reset revision to zero when adding APIs dnl bump current, leave age, reset revision to zero when changing/removing APIS -LIBT_CURRENT=8 +LIBT_CURRENT=9 LIBT_REVISION=0 AC_SUBST(LIBT_CURRENT) AC_SUBST(LIBT_REVISION) -LIBT_AGE=7 +LIBT_AGE=8 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE" AC_SUBST(LIBT_VERSION_INFO) @@ -54,6 +54,9 @@ LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` AC_SUBST(LIBT_CURRENT_MINUS_AGE) +PKGCONFIG_REQUIRES= +PKGCONFIG_REQUIRES_PRIVATELY= + dnl ========================================================================== AC_CONFIG_HEADERS(config.h) @@ -161,6 +164,37 @@ AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_POSIX_FADVISE], [1], [Define to 1 if you have the 'posix_fadvise' function.]) ],[AC_MSG_RESULT([no])]) +if test "$os_win32" = "no"; then + AC_MSG_CHECKING([for scandir]) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #include + int comp(const struct dirent **, const struct dirent **); + int comp(const struct dirent **a, const struct dirent **b) { return 0; } + int main(void) { + struct dirent **d; + return scandir(".", &d, 0, &comp) >= 0; + } + ]])],[ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_SCANDIR], [1], [Define to 1 if you have the 'scandir' function.]) + ],[ + AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #include + int comp(const void *, const void *); + int comp(const void *a, const void *b) { return 0; } + int main(void) { + struct dirent **d; + return scandir(".", &d, 0, &comp) >= 0; + } + ]])],[ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_SCANDIR_VOID_P], [1], [Define to 1 if you have the 'scandir' function with int (* compar)(const void *, const void *)]) + ],[ + AC_MSG_ERROR([ +*** No scandir function available.]) + ]) + ]) +fi CFLAGS="$fc_saved_CFLAGS" # @@ -251,13 +285,14 @@ AC_TRY_LINK([#include ], [iconv_open ("from", "to");], [iconv_type="libiconv" - use_iconv=1], + use_iconv=1 + ICONV_CFLAGS="$libiconv_cflags" + ICONV_LIBS="$libiconv_libs" + ], [use_iconv=0]) CFLAGS="$iconvsaved_CFLAGS" LIBS="$iconvsaved_LIBS" - ICONV_CFLAGS="$libiconv_cflags" - ICONV_LIBS="$libiconv_libs" fi if test "x$use_iconv" = "x0"; then AC_TRY_LINK([#include ], @@ -277,6 +312,7 @@ # Checks for FreeType # PKG_CHECK_MODULES(FREETYPE, freetype2) +PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2" AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) @@ -336,6 +372,8 @@ else EXPAT_LIBS="-lexpat" fi + else + PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY expat" fi expatsaved_CPPFLAGS="$CPPFLAGS" @@ -377,6 +415,7 @@ if test "$enable_libxml2" = "yes"; then PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6]) + PKGCONFIG_REQUIRES_PRIVATELY="$PKGCONFIG_REQUIRES_PRIVATELY libxml-2.0" AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat]) AC_SUBST(LIBXML2_CFLAGS) @@ -549,7 +588,7 @@ esac case "$configdir" in no|yes) - configdir='${baseconfigdir}'/conf.d + configdir='${BASECONFIGDIR}'/conf.d ;; *) ;; @@ -566,13 +605,9 @@ BASECONFIGDIR=${baseconfigdir} CONFIGDIR=${configdir} XMLDIR=${xmldir} -AC_SUBST(templatedir) AC_SUBST(TEMPLATEDIR) -AC_SUBST(baseconfigdir) AC_SUBST(BASECONFIGDIR) -AC_SUBST(configdir) AC_SUBST(CONFIGDIR) -AC_SUBST(xmldir) AC_SUBST(XMLDIR) @@ -684,6 +719,12 @@ dnl particularly for fat binaries AH_BOTTOM([#include "config-fixups.h"]) +dnl +dnl +AC_SUBST(PKGCONFIG_REQUIRES) +AC_SUBST(PKGCONFIG_REQUIRES_PRIVATELY) + +dnl AC_CONFIG_FILES([ Makefile fontconfig/Makefile diff -Nru fontconfig-2.10.93/debian/changelog fontconfig-2.11.0/debian/changelog --- fontconfig-2.10.93/debian/changelog 2013-05-21 11:51:55.000000000 +0000 +++ fontconfig-2.11.0/debian/changelog 2013-11-10 07:32:29.000000000 +0000 @@ -1,3 +1,15 @@ +fontconfig (2.11.0-0ubuntu1~saucy1) saucy; urgency=medium + + * Copied from trusty + + -- Rico Tzschichholz Sun, 10 Nov 2013 08:32:29 +0100 + +fontconfig (2.11.0-0ubuntu1) trusty; urgency=low + + * New upstream version + + -- Sebastien Bacher Wed, 06 Nov 2013 11:43:06 +0100 + fontconfig (2.10.93-0ubuntu1) saucy; urgency=low * New upstream version diff -Nru fontconfig-2.10.93/debian/patches/00_old_diff_gz.patch fontconfig-2.11.0/debian/patches/00_old_diff_gz.patch --- fontconfig-2.10.93/debian/patches/00_old_diff_gz.patch 2013-05-21 11:46:45.000000000 +0000 +++ fontconfig-2.11.0/debian/patches/00_old_diff_gz.patch 2013-11-06 10:30:50.000000000 +0000 @@ -1,7 +1,7 @@ -Index: fontconfig-2.10.93/conf.d/40-nonlatin.conf +Index: fontconfig-2.11.0/conf.d/40-nonlatin.conf =================================================================== ---- fontconfig-2.10.93.orig/conf.d/40-nonlatin.conf 2013-05-21 13:46:42.362358890 +0200 -+++ fontconfig-2.10.93/conf.d/40-nonlatin.conf 2013-05-21 13:46:42.354358891 +0200 +--- fontconfig-2.11.0.orig/conf.d/40-nonlatin.conf 2013-11-06 11:30:46.228295938 +0100 ++++ fontconfig-2.11.0/conf.d/40-nonlatin.conf 2013-11-06 11:30:46.220295937 +0100 @@ -161,6 +161,10 @@ sans-serif @@ -13,10 +13,10 @@ Sazanami Gothic sans-serif -Index: fontconfig-2.10.93/conf.d/60-latin.conf +Index: fontconfig-2.11.0/conf.d/60-latin.conf =================================================================== ---- fontconfig-2.10.93.orig/conf.d/60-latin.conf 2013-05-21 13:46:42.362358890 +0200 -+++ fontconfig-2.10.93/conf.d/60-latin.conf 2013-05-21 13:46:42.354358891 +0200 +--- fontconfig-2.11.0.orig/conf.d/60-latin.conf 2013-11-06 11:30:46.228295938 +0100 ++++ fontconfig-2.11.0/conf.d/60-latin.conf 2013-11-06 11:30:46.220295937 +0100 @@ -4,8 +4,8 @@ serif @@ -47,10 +47,10 @@ Inconsolata Andale Mono Courier New -Index: fontconfig-2.10.93/conf.d/Makefile.am +Index: fontconfig-2.11.0/conf.d/Makefile.am =================================================================== ---- fontconfig-2.10.93.orig/conf.d/Makefile.am 2013-05-21 13:46:42.362358890 +0200 -+++ fontconfig-2.10.93/conf.d/Makefile.am 2013-05-21 13:46:42.354358891 +0200 +--- fontconfig-2.11.0.orig/conf.d/Makefile.am 2013-11-06 11:30:46.228295938 +0100 ++++ fontconfig-2.11.0/conf.d/Makefile.am 2013-11-06 11:30:46.220295937 +0100 @@ -26,6 +26,9 @@ DOC_FILES = $(DOC_SOURCES:.in=) @@ -82,11 +82,11 @@ 60-latin.conf \ 65-fonts-persian.conf \ 65-khmer.conf \ -Index: fontconfig-2.10.93/conf.d/Makefile.in +Index: fontconfig-2.11.0/conf.d/Makefile.in =================================================================== ---- fontconfig-2.10.93.orig/conf.d/Makefile.in 2013-05-21 13:46:42.362358890 +0200 -+++ fontconfig-2.10.93/conf.d/Makefile.in 2013-05-21 13:46:42.358358890 +0200 -@@ -300,6 +300,9 @@ +--- fontconfig-2.11.0.orig/conf.d/Makefile.in 2013-11-06 11:30:46.228295938 +0100 ++++ fontconfig-2.11.0/conf.d/Makefile.in 2013-11-06 11:30:46.224295937 +0100 +@@ -327,6 +327,9 @@ DOC_SOURCES = README.in DOC_FILES = $(DOC_SOURCES:.in=) CONF_LINKS = \ @@ -96,9 +96,9 @@ 10-scale-bitmap-fonts.conf \ 20-unhint-small-vera.conf \ 30-urw-aliases.conf \ -@@ -320,7 +323,12 @@ - CLEANFILES = $(DOC_FILES) +@@ -349,7 +352,12 @@ config_DATA = $(DOC_FILES) + templatedir = $(TEMPLATEDIR) template_DATA = \ + 10-antialias.conf \ 10-autohint.conf \ @@ -109,7 +109,7 @@ 10-no-sub-pixel.conf \ 10-scale-bitmap-fonts.conf \ 10-sub-pixel-bgr.conf \ -@@ -340,6 +348,7 @@ +@@ -369,6 +377,7 @@ 49-sansserif.conf \ 50-user.conf \ 51-local.conf \ diff -Nru fontconfig-2.10.93/debian/patches/05_lcdfilterlegacy.patch fontconfig-2.11.0/debian/patches/05_lcdfilterlegacy.patch --- fontconfig-2.10.93/debian/patches/05_lcdfilterlegacy.patch 2013-05-21 11:46:52.000000000 +0000 +++ fontconfig-2.11.0/debian/patches/05_lcdfilterlegacy.patch 2013-11-06 10:31:00.000000000 +0000 @@ -1,8 +1,8 @@ -Index: fontconfig-2.10.93/src/fcname.c +Index: fontconfig-2.11.0/src/fcname.c =================================================================== ---- fontconfig-2.10.93.orig/src/fcname.c 2013-05-21 13:46:51.050358515 +0200 -+++ fontconfig-2.10.93/src/fcname.c 2013-05-21 13:46:51.046358515 +0200 -@@ -188,6 +188,7 @@ +--- fontconfig-2.11.0.orig/src/fcname.c 2013-11-06 11:30:58.368296342 +0100 ++++ fontconfig-2.11.0/src/fcname.c 2013-11-06 11:30:58.364296342 +0100 +@@ -190,6 +190,7 @@ { (FcChar8 *) "lcddefault", "lcdfilter", FC_LCD_DEFAULT }, { (FcChar8 *) "lcdlight", "lcdfilter", FC_LCD_LIGHT }, { (FcChar8 *) "lcdlegacy", "lcdfilter", FC_LCD_LEGACY }, diff -Nru fontconfig-2.10.93/debian/patches/06_ubuntu_lcddefault.patch fontconfig-2.11.0/debian/patches/06_ubuntu_lcddefault.patch --- fontconfig-2.10.93/debian/patches/06_ubuntu_lcddefault.patch 2013-05-21 11:46:56.000000000 +0000 +++ fontconfig-2.11.0/debian/patches/06_ubuntu_lcddefault.patch 2013-11-06 10:31:05.000000000 +0000 @@ -1,7 +1,7 @@ -Index: fontconfig-2.10.93/conf.d/Makefile.am +Index: fontconfig-2.11.0/conf.d/Makefile.am =================================================================== ---- fontconfig-2.10.93.orig/conf.d/Makefile.am 2013-05-21 13:46:55.182358336 +0200 -+++ fontconfig-2.10.93/conf.d/Makefile.am 2013-05-21 13:46:55.178358336 +0200 +--- fontconfig-2.11.0.orig/conf.d/Makefile.am 2013-11-06 11:31:03.312296507 +0100 ++++ fontconfig-2.11.0/conf.d/Makefile.am 2013-11-06 11:31:03.308296506 +0100 @@ -30,6 +30,7 @@ 10-hinting.conf \ 10-hinting-slight.conf \ @@ -10,11 +10,11 @@ 20-unhint-small-vera.conf \ 30-urw-aliases.conf \ 30-metric-aliases.conf \ -Index: fontconfig-2.10.93/conf.d/Makefile.in +Index: fontconfig-2.11.0/conf.d/Makefile.in =================================================================== ---- fontconfig-2.10.93.orig/conf.d/Makefile.in 2013-05-21 13:46:55.182358336 +0200 -+++ fontconfig-2.10.93/conf.d/Makefile.in 2013-05-21 13:46:55.178358336 +0200 -@@ -304,6 +304,7 @@ +--- fontconfig-2.11.0.orig/conf.d/Makefile.in 2013-11-06 11:31:03.312296507 +0100 ++++ fontconfig-2.11.0/conf.d/Makefile.in 2013-11-06 11:31:03.308296506 +0100 +@@ -331,6 +331,7 @@ 10-hinting.conf \ 10-hinting-slight.conf \ 10-scale-bitmap-fonts.conf \ diff -Nru fontconfig-2.10.93/debian/patches/07_no_bitmaps.patch fontconfig-2.11.0/debian/patches/07_no_bitmaps.patch --- fontconfig-2.10.93/debian/patches/07_no_bitmaps.patch 2013-05-21 11:46:59.000000000 +0000 +++ fontconfig-2.11.0/debian/patches/07_no_bitmaps.patch 2013-11-06 10:31:07.000000000 +0000 @@ -1,7 +1,7 @@ -Index: fontconfig-2.10.93/conf.d/Makefile.am +Index: fontconfig-2.11.0/conf.d/Makefile.am =================================================================== ---- fontconfig-2.10.93.orig/conf.d/Makefile.am 2013-05-21 13:46:57.634358230 +0200 -+++ fontconfig-2.10.93/conf.d/Makefile.am 2013-05-21 13:46:57.626358230 +0200 +--- fontconfig-2.11.0.orig/conf.d/Makefile.am 2013-11-06 11:31:06.052296598 +0100 ++++ fontconfig-2.11.0/conf.d/Makefile.am 2013-11-06 11:31:06.044296598 +0100 @@ -43,6 +43,7 @@ 65-fonts-persian.conf \ 65-nonlatin.conf \ @@ -10,11 +10,11 @@ 80-delicious.conf \ 90-synthetic.conf -Index: fontconfig-2.10.93/conf.d/Makefile.in +Index: fontconfig-2.11.0/conf.d/Makefile.in =================================================================== ---- fontconfig-2.10.93.orig/conf.d/Makefile.in 2013-05-21 13:46:57.634358230 +0200 -+++ fontconfig-2.10.93/conf.d/Makefile.in 2013-05-21 13:46:57.626358230 +0200 -@@ -317,6 +317,7 @@ +--- fontconfig-2.11.0.orig/conf.d/Makefile.in 2013-11-06 11:31:06.052296598 +0100 ++++ fontconfig-2.11.0/conf.d/Makefile.in 2013-11-06 11:31:06.048296598 +0100 +@@ -344,6 +344,7 @@ 65-fonts-persian.conf \ 65-nonlatin.conf \ 69-unifont.conf \ diff -Nru fontconfig-2.10.93/depcomp fontconfig-2.11.0/depcomp --- fontconfig-2.10.93/depcomp 2012-09-26 14:03:18.000000000 +0000 +++ fontconfig-2.11.0/depcomp 2013-06-17 09:16:35.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -74,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -85,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -133,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -142,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -156,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -173,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -199,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -208,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -216,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -246,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -261,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -272,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -341,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -354,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -365,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -445,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -472,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -523,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -582,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -621,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -656,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru fontconfig-2.10.93/doc/FcAtomicCreate.3 fontconfig-2.11.0/doc/FcAtomicCreate.3 --- fontconfig-2.10.93/doc/FcAtomicCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicCreate" "3" "20 5月 2013" "" "" +.TH "FcAtomicCreate" "3" "11 10月 2013" "" "" .SH NAME FcAtomicCreate \- create an FcAtomic object .SH SYNOPSIS @@ -16,4 +16,4 @@ a consistent and complete file without the need to lock for reading. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicDeleteNew.3 fontconfig-2.11.0/doc/FcAtomicDeleteNew.3 --- fontconfig-2.10.93/doc/FcAtomicDeleteNew.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicDeleteNew.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicDeleteNew" "3" "20 5月 2013" "" "" +.TH "FcAtomicDeleteNew" "3" "11 10月 2013" "" "" .SH NAME FcAtomicDeleteNew \- delete new file .SH SYNOPSIS @@ -13,4 +13,4 @@ Deletes the new file. Used in error recovery to back out changes. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicDestroy.3 fontconfig-2.11.0/doc/FcAtomicDestroy.3 --- fontconfig-2.10.93/doc/FcAtomicDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicDestroy" "3" "20 5月 2013" "" "" +.TH "FcAtomicDestroy" "3" "11 10月 2013" "" "" .SH NAME FcAtomicDestroy \- destroy an FcAtomic object .SH SYNOPSIS @@ -13,4 +13,4 @@ Destroys \fIatomic\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicLock.3 fontconfig-2.11.0/doc/FcAtomicLock.3 --- fontconfig-2.10.93/doc/FcAtomicLock.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicLock.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicLock" "3" "20 5月 2013" "" "" +.TH "FcAtomicLock" "3" "11 10月 2013" "" "" .SH NAME FcAtomicLock \- lock a file .SH SYNOPSIS @@ -15,4 +15,4 @@ leaves the file locked. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicNewFile.3 fontconfig-2.11.0/doc/FcAtomicNewFile.3 --- fontconfig-2.10.93/doc/FcAtomicNewFile.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicNewFile.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicNewFile" "3" "20 5月 2013" "" "" +.TH "FcAtomicNewFile" "3" "11 10月 2013" "" "" .SH NAME FcAtomicNewFile \- return new temporary file name .SH SYNOPSIS @@ -14,4 +14,4 @@ by \fIatomic\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicOrigFile.3 fontconfig-2.11.0/doc/FcAtomicOrigFile.3 --- fontconfig-2.10.93/doc/FcAtomicOrigFile.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicOrigFile.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicOrigFile" "3" "20 5月 2013" "" "" +.TH "FcAtomicOrigFile" "3" "11 10月 2013" "" "" .SH NAME FcAtomicOrigFile \- return original file name .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the file referenced by \fIatomic\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicReplaceOrig.3 fontconfig-2.11.0/doc/FcAtomicReplaceOrig.3 --- fontconfig-2.10.93/doc/FcAtomicReplaceOrig.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicReplaceOrig.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicReplaceOrig" "3" "20 5月 2013" "" "" +.TH "FcAtomicReplaceOrig" "3" "11 10月 2013" "" "" .SH NAME FcAtomicReplaceOrig \- replace original with new .SH SYNOPSIS @@ -15,4 +15,4 @@ permission issues in the filesystem. Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcAtomicUnlock.3 fontconfig-2.11.0/doc/FcAtomicUnlock.3 --- fontconfig-2.10.93/doc/FcAtomicUnlock.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcAtomicUnlock.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcAtomicUnlock" "3" "20 5月 2013" "" "" +.TH "FcAtomicUnlock" "3" "11 10月 2013" "" "" .SH NAME FcAtomicUnlock \- unlock a file .SH SYNOPSIS @@ -13,4 +13,4 @@ Unlocks the file. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcBlanksAdd.3 fontconfig-2.11.0/doc/FcBlanksAdd.3 --- fontconfig-2.10.93/doc/FcBlanksAdd.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcBlanksAdd.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcBlanksAdd" "3" "20 5月 2013" "" "" +.TH "FcBlanksAdd" "3" "11 10月 2013" "" "" .SH NAME FcBlanksAdd \- Add a character to an FcBlanks .SH SYNOPSIS @@ -14,4 +14,4 @@ if this process ran out of memory. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcBlanksCreate.3 fontconfig-2.11.0/doc/FcBlanksCreate.3 --- fontconfig-2.10.93/doc/FcBlanksCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcBlanksCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcBlanksCreate" "3" "20 5月 2013" "" "" +.TH "FcBlanksCreate" "3" "11 10月 2013" "" "" .SH NAME FcBlanksCreate \- Create an FcBlanks .SH SYNOPSIS @@ -13,4 +13,4 @@ Creates an empty FcBlanks object. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcBlanksDestroy.3 fontconfig-2.11.0/doc/FcBlanksDestroy.3 --- fontconfig-2.10.93/doc/FcBlanksDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcBlanksDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcBlanksDestroy" "3" "20 5月 2013" "" "" +.TH "FcBlanksDestroy" "3" "11 10月 2013" "" "" .SH NAME FcBlanksDestroy \- Destroy and FcBlanks .SH SYNOPSIS @@ -13,4 +13,4 @@ Destroys an FcBlanks object, freeing any associated memory. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcBlanksIsMember.3 fontconfig-2.11.0/doc/FcBlanksIsMember.3 --- fontconfig-2.10.93/doc/FcBlanksIsMember.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcBlanksIsMember.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcBlanksIsMember" "3" "20 5月 2013" "" "" +.TH "FcBlanksIsMember" "3" "11 10月 2013" "" "" .SH NAME FcBlanksIsMember \- Query membership in an FcBlanks .SH SYNOPSIS @@ -14,4 +14,4 @@ value. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCacheCopySet.3 fontconfig-2.11.0/doc/FcCacheCopySet.3 --- fontconfig-2.10.93/doc/FcCacheCopySet.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCacheCopySet.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCacheCopySet" "3" "20 5月 2013" "" "" +.TH "FcCacheCopySet" "3" "11 10月 2013" "" "" .SH NAME FcCacheCopySet \- Returns a copy of the fontset from cache .SH SYNOPSIS @@ -15,4 +15,4 @@ from the cache are read-only. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCacheCreateTagFile.3 fontconfig-2.11.0/doc/FcCacheCreateTagFile.3 --- fontconfig-2.10.93/doc/FcCacheCreateTagFile.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCacheCreateTagFile.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCacheCreateTagFile" "3" "20 5月 2013" "" "" +.TH "FcCacheCreateTagFile" "3" "11 10月 2013" "" "" .SH NAME FcCacheCreateTagFile \- Create CACHEDIR.TAG at cache directory. .SH SYNOPSIS @@ -14,4 +14,4 @@ to \fIconfig\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCacheDir.3 fontconfig-2.11.0/doc/FcCacheDir.3 --- fontconfig-2.10.93/doc/FcCacheDir.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCacheDir.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCacheDir" "3" "20 5月 2013" "" "" +.TH "FcCacheDir" "3" "11 10月 2013" "" "" .SH NAME FcCacheDir \- Return directory of cache .SH SYNOPSIS @@ -13,4 +13,4 @@ This function returns the directory from which the cache was constructed. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCacheNumFont.3 fontconfig-2.11.0/doc/FcCacheNumFont.3 --- fontconfig-2.10.93/doc/FcCacheNumFont.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCacheNumFont.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCacheNumFont" "3" "20 5月 2013" "" "" +.TH "FcCacheNumFont" "3" "11 10月 2013" "" "" .SH NAME FcCacheNumFont \- Returns the number of fonts in cache. .SH SYNOPSIS @@ -14,4 +14,4 @@ FcCacheCopySet. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCacheNumSubdir.3 fontconfig-2.11.0/doc/FcCacheNumSubdir.3 --- fontconfig-2.10.93/doc/FcCacheNumSubdir.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCacheNumSubdir.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCacheNumSubdir" "3" "20 5月 2013" "" "" +.TH "FcCacheNumSubdir" "3" "11 10月 2013" "" "" .SH NAME FcCacheNumSubdir \- Return the number of subdirectories in cache. .SH SYNOPSIS @@ -13,4 +13,4 @@ This returns the total number of subdirectories in the cache. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCacheSubdir.3 fontconfig-2.11.0/doc/FcCacheSubdir.3 --- fontconfig-2.10.93/doc/FcCacheSubdir.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCacheSubdir.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCacheSubdir" "3" "20 5月 2013" "" "" +.TH "FcCacheSubdir" "3" "11 10月 2013" "" "" .SH NAME FcCacheSubdir \- Return the i'th subdirectory. .SH SYNOPSIS @@ -16,4 +16,4 @@ value from FcCacheNumSubdir. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetAddChar.3 fontconfig-2.11.0/doc/FcCharSetAddChar.3 --- fontconfig-2.10.93/doc/FcCharSetAddChar.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetAddChar.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetAddChar" "3" "20 5月 2013" "" "" +.TH "FcCharSetAddChar" "3" "11 10月 2013" "" "" .SH NAME FcCharSetAddChar \- Add a character to a charset .SH SYNOPSIS @@ -15,4 +15,4 @@ running out of memory. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetCopy.3 fontconfig-2.11.0/doc/FcCharSetCopy.3 --- fontconfig-2.10.93/doc/FcCharSetCopy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetCopy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetCopy" "3" "20 5月 2013" "" "" +.TH "FcCharSetCopy" "3" "11 10月 2013" "" "" .SH NAME FcCharSetCopy \- Copy a charset .SH SYNOPSIS @@ -14,4 +14,4 @@ than increment the reference count on \fIsrc\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetCount.3 fontconfig-2.11.0/doc/FcCharSetCount.3 --- fontconfig-2.10.93/doc/FcCharSetCount.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetCount.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetCount" "3" "20 5月 2013" "" "" +.TH "FcCharSetCount" "3" "11 10月 2013" "" "" .SH NAME FcCharSetCount \- Count entries in a charset .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the total number of Unicode chars in \fIa\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetCoverage.3 fontconfig-2.11.0/doc/FcCharSetCoverage.3 --- fontconfig-2.10.93/doc/FcCharSetCoverage.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetCoverage.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetCoverage" "3" "20 5月 2013" "" "" +.TH "FcCharSetCoverage" "3" "11 10月 2013" "" "" .SH NAME FcCharSetCoverage \- DEPRECATED return coverage for a Unicode page .SH SYNOPSIS @@ -18,4 +18,4 @@ coverage. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetCreate.3 fontconfig-2.11.0/doc/FcCharSetCreate.3 --- fontconfig-2.10.93/doc/FcCharSetCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetCreate" "3" "20 5月 2013" "" "" +.TH "FcCharSetCreate" "3" "11 10月 2013" "" "" .SH NAME FcCharSetCreate \- Create an empty character set .SH SYNOPSIS @@ -14,4 +14,4 @@ character set object. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetDelChar.3 fontconfig-2.11.0/doc/FcCharSetDelChar.3 --- fontconfig-2.10.93/doc/FcCharSetDelChar.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetDelChar.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetDelChar" "3" "20 5月 2013" "" "" +.TH "FcCharSetDelChar" "3" "11 10月 2013" "" "" .SH NAME FcCharSetDelChar \- Add a character to a charset .SH SYNOPSIS @@ -15,4 +15,4 @@ running out of memory. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetDestroy.3 fontconfig-2.11.0/doc/FcCharSetDestroy.3 --- fontconfig-2.10.93/doc/FcCharSetDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetDestroy" "3" "20 5月 2013" "" "" +.TH "FcCharSetDestroy" "3" "11 10月 2013" "" "" .SH NAME FcCharSetDestroy \- Destroy a character set .SH SYNOPSIS @@ -15,4 +15,4 @@ memory referenced is freed. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetEqual.3 fontconfig-2.11.0/doc/FcCharSetEqual.3 --- fontconfig-2.10.93/doc/FcCharSetEqual.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetEqual.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetEqual" "3" "20 5月 2013" "" "" +.TH "FcCharSetEqual" "3" "11 10月 2013" "" "" .SH NAME FcCharSetEqual \- Compare two charsets .SH SYNOPSIS @@ -14,4 +14,4 @@ contain the same set of Unicode chars. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetFirstPage.3 fontconfig-2.11.0/doc/FcCharSetFirstPage.3 --- fontconfig-2.10.93/doc/FcCharSetFirstPage.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetFirstPage.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetFirstPage" "3" "20 5月 2013" "" "" +.TH "FcCharSetFirstPage" "3" "11 10月 2013" "" "" .SH NAME FcCharSetFirstPage \- Start enumerating charset contents .SH SYNOPSIS @@ -10,9 +10,29 @@ .fi\fR .SH "DESCRIPTION" .PP -Builds an array of bits marking the first page of Unicode coverage of -\fIa\fR\&. Returns the base of the array. \fInext\fR contains the next page in the -font. +Builds an array of bits in \fImap\fR marking the +first page of Unicode coverage of \fIa\fR\&. +\fI*next\fR is set to contains the base code point +for the next page in \fIa\fR\&. Returns the base code +point for the page, or FC_CHARSET_DONE if +\fIa\fR contains no pages. As an example, if +\fBFcCharSetFirstPage\fR returns +0x300 and fills \fImap\fR with +.sp +.nf +0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff7fff 0xffff0003 +.sp +.fi +Then the page contains code points 0x300 through +0x33f (the first 64 code points on the page) +because \fImap[0]\fR and +\fImap[1]\fR both have all their bits set. It also +contains code points 0x343 (\fI0x300 + 32*2 ++ (4-1)\fR) and 0x35e (\fI0x300 + +32*2 + (31-1)\fR) because \fImap[2]\fR has +the 4th and 31st bits set. The code points represented by +map[3] and later are left as an excercise for the +reader ;). .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetHasChar.3 fontconfig-2.11.0/doc/FcCharSetHasChar.3 --- fontconfig-2.10.93/doc/FcCharSetHasChar.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetHasChar.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetHasChar" "3" "20 5月 2013" "" "" +.TH "FcCharSetHasChar" "3" "11 10月 2013" "" "" .SH NAME FcCharSetHasChar \- Check a charset for a char .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns whether \fIfcs\fR contains the char \fIucs4\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetIntersect.3 fontconfig-2.11.0/doc/FcCharSetIntersect.3 --- fontconfig-2.10.93/doc/FcCharSetIntersect.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetIntersect.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetIntersect" "3" "20 5月 2013" "" "" +.TH "FcCharSetIntersect" "3" "11 10月 2013" "" "" .SH NAME FcCharSetIntersect \- Intersect charsets .SH SYNOPSIS @@ -14,4 +14,4 @@ \fIa\fR and \fIb\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetIntersectCount.3 fontconfig-2.11.0/doc/FcCharSetIntersectCount.3 --- fontconfig-2.10.93/doc/FcCharSetIntersectCount.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetIntersectCount.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetIntersectCount" "3" "20 5月 2013" "" "" +.TH "FcCharSetIntersectCount" "3" "11 10月 2013" "" "" .SH NAME FcCharSetIntersectCount \- Intersect and count charsets .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the number of chars that are in both \fIa\fR and \fIb\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetIsSubset.3 fontconfig-2.11.0/doc/FcCharSetIsSubset.3 --- fontconfig-2.10.93/doc/FcCharSetIsSubset.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetIsSubset.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetIsSubset" "3" "20 5月 2013" "" "" +.TH "FcCharSetIsSubset" "3" "11 10月 2013" "" "" .SH NAME FcCharSetIsSubset \- Test for charset inclusion .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns whether \fIa\fR is a subset of \fIb\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetMerge.3 fontconfig-2.11.0/doc/FcCharSetMerge.3 --- fontconfig-2.10.93/doc/FcCharSetMerge.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetMerge.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetMerge" "3" "20 5月 2013" "" "" +.TH "FcCharSetMerge" "3" "11 10月 2013" "" "" .SH NAME FcCharSetMerge \- Merge charsets .SH SYNOPSIS @@ -18,4 +18,4 @@ set or from running out of memory. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetNew.3 fontconfig-2.11.0/doc/FcCharSetNew.3 --- fontconfig-2.10.93/doc/FcCharSetNew.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetNew.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetNew" "3" "20 5月 2013" "" "" +.TH "FcCharSetNew" "3" "11 10月 2013" "" "" .SH NAME FcCharSetNew \- DEPRECATED alias for FcCharSetCreate .SH SYNOPSIS @@ -13,4 +13,4 @@ \fBFcCharSetNew\fR is a DEPRECATED alias for FcCharSetCreate. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetNextPage.3 fontconfig-2.11.0/doc/FcCharSetNextPage.3 --- fontconfig-2.10.93/doc/FcCharSetNextPage.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetNextPage.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetNextPage" "3" "20 5月 2013" "" "" +.TH "FcCharSetNextPage" "3" "11 10月 2013" "" "" .SH NAME FcCharSetNextPage \- Continue enumerating charset contents .SH SYNOPSIS @@ -10,9 +10,15 @@ .fi\fR .SH "DESCRIPTION" .PP -Builds an array of bits marking the Unicode coverage of \fIa\fR for page -\fI*next\fR\&. Returns the base of the array. \fInext\fR contains the next page in -the font. +Builds an array of bits in \fImap\fR marking the +Unicode coverage of \fIa\fR for page containing +\fI*next\fR (see the +\fBFcCharSetFirstPage\fR description for details). +\fI*next\fR is set to contains the base code point +for the next page in \fIa\fR\&. Returns the base of +code point for the page, or FC_CHARSET_DONE if +\fIa\fR does not contain +\fI*next\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetSubtract.3 fontconfig-2.11.0/doc/FcCharSetSubtract.3 --- fontconfig-2.10.93/doc/FcCharSetSubtract.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetSubtract.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetSubtract" "3" "20 5月 2013" "" "" +.TH "FcCharSetSubtract" "3" "11 10月 2013" "" "" .SH NAME FcCharSetSubtract \- Subtract charsets .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns a set including only those chars found in \fIa\fR but not \fIb\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetSubtractCount.3 fontconfig-2.11.0/doc/FcCharSetSubtractCount.3 --- fontconfig-2.10.93/doc/FcCharSetSubtractCount.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetSubtractCount.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetSubtractCount" "3" "20 5月 2013" "" "" +.TH "FcCharSetSubtractCount" "3" "11 10月 2013" "" "" .SH NAME FcCharSetSubtractCount \- Subtract and count charsets .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the number of chars that are in \fIa\fR but not in \fIb\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcCharSetUnion.3 fontconfig-2.11.0/doc/FcCharSetUnion.3 --- fontconfig-2.10.93/doc/FcCharSetUnion.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcCharSetUnion.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcCharSetUnion" "3" "20 5月 2013" "" "" +.TH "FcCharSetUnion" "3" "11 10月 2013" "" "" .SH NAME FcCharSetUnion \- Add charsets .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns a set including only those chars found in either \fIa\fR or \fIb\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigAppFontAddDir.3 fontconfig-2.11.0/doc/FcConfigAppFontAddDir.3 --- fontconfig-2.10.93/doc/FcConfigAppFontAddDir.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigAppFontAddDir.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigAppFontAddDir" "3" "20 5月 2013" "" "" +.TH "FcConfigAppFontAddDir" "3" "11 10月 2013" "" "" .SH NAME FcConfigAppFontAddDir \- Add fonts from directory to font database .SH SYNOPSIS @@ -16,4 +16,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigAppFontAddFile.3 fontconfig-2.11.0/doc/FcConfigAppFontAddFile.3 --- fontconfig-2.10.93/doc/FcConfigAppFontAddFile.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigAppFontAddFile.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigAppFontAddFile" "3" "20 5月 2013" "" "" +.TH "FcConfigAppFontAddFile" "3" "11 10月 2013" "" "" .SH NAME FcConfigAppFontAddFile \- Add font file to font database .SH SYNOPSIS @@ -15,4 +15,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigAppFontClear.3 fontconfig-2.11.0/doc/FcConfigAppFontClear.3 --- fontconfig-2.10.93/doc/FcConfigAppFontClear.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigAppFontClear.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigAppFontClear" "3" "20 5月 2013" "" "" +.TH "FcConfigAppFontClear" "3" "11 10月 2013" "" "" .SH NAME FcConfigAppFontClear \- Remove all app fonts from font database .SH SYNOPSIS @@ -14,4 +14,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigBuildFonts.3 fontconfig-2.11.0/doc/FcConfigBuildFonts.3 --- fontconfig-2.10.93/doc/FcConfigBuildFonts.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigBuildFonts.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigBuildFonts" "3" "20 5月 2013" "" "" +.TH "FcConfigBuildFonts" "3" "11 10月 2013" "" "" .SH NAME FcConfigBuildFonts \- Build font database .SH SYNOPSIS @@ -16,4 +16,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigCreate.3 fontconfig-2.11.0/doc/FcConfigCreate.3 --- fontconfig-2.10.93/doc/FcConfigCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigCreate" "3" "20 5月 2013" "" "" +.TH "FcConfigCreate" "3" "11 10月 2013" "" "" .SH NAME FcConfigCreate \- Create a configuration .SH SYNOPSIS @@ -13,4 +13,4 @@ Creates an empty configuration. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigDestroy.3 fontconfig-2.11.0/doc/FcConfigDestroy.3 --- fontconfig-2.10.93/doc/FcConfigDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigDestroy" "3" "20 5月 2013" "" "" +.TH "FcConfigDestroy" "3" "11 10月 2013" "" "" .SH NAME FcConfigDestroy \- Destroy a configuration .SH SYNOPSIS @@ -16,4 +16,4 @@ cause a new configuration to be created for use as current configuration. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigEnableHome.3 fontconfig-2.11.0/doc/FcConfigEnableHome.3 --- fontconfig-2.10.93/doc/FcConfigEnableHome.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigEnableHome.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigEnableHome" "3" "20 5月 2013" "" "" +.TH "FcConfigEnableHome" "3" "11 10月 2013" "" "" .SH NAME FcConfigEnableHome \- controls use of the home directory. .SH SYNOPSIS @@ -17,4 +17,4 @@ disabled. The previous setting of the value is returned. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigFilename.3 fontconfig-2.11.0/doc/FcConfigFilename.3 --- fontconfig-2.10.93/doc/FcConfigFilename.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigFilename.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigFilename" "3" "20 5月 2013" "" "" +.TH "FcConfigFilename" "3" "11 10月 2013" "" "" .SH NAME FcConfigFilename \- Find a config file .SH SYNOPSIS @@ -23,4 +23,4 @@ FONTCONFIG_PATH environment variable. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetBlanks.3 fontconfig-2.11.0/doc/FcConfigGetBlanks.3 --- fontconfig-2.10.93/doc/FcConfigGetBlanks.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetBlanks.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetBlanks" "3" "20 5月 2013" "" "" +.TH "FcConfigGetBlanks" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetBlanks \- Get config blanks .SH SYNOPSIS @@ -17,4 +17,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetCache.3 fontconfig-2.11.0/doc/FcConfigGetCache.3 --- fontconfig-2.10.93/doc/FcConfigGetCache.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetCache.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetCache" "3" "20 5月 2013" "" "" +.TH "FcConfigGetCache" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetCache \- DEPRECATED used to return per-user cache filename .SH SYNOPSIS @@ -14,4 +14,4 @@ simply returns NULL to indicate that no per-user file exists. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetCacheDirs.3 fontconfig-2.11.0/doc/FcConfigGetCacheDirs.3 --- fontconfig-2.10.93/doc/FcConfigGetCacheDirs.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetCacheDirs.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetCacheDirs" "3" "20 5月 2013" "" "" +.TH "FcConfigGetCacheDirs" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetCacheDirs \- return the list of directories searched for cache files .SH SYNOPSIS @@ -16,4 +16,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetConfigDirs.3 fontconfig-2.11.0/doc/FcConfigGetConfigDirs.3 --- fontconfig-2.10.93/doc/FcConfigGetConfigDirs.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetConfigDirs.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetConfigDirs" "3" "20 5月 2013" "" "" +.TH "FcConfigGetConfigDirs" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetConfigDirs \- Get config directories .SH SYNOPSIS @@ -15,4 +15,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetConfigFiles.3 fontconfig-2.11.0/doc/FcConfigGetConfigFiles.3 --- fontconfig-2.10.93/doc/FcConfigGetConfigFiles.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetConfigFiles.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetConfigFiles" "3" "20 5月 2013" "" "" +.TH "FcConfigGetConfigFiles" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetConfigFiles \- Get config files .SH SYNOPSIS @@ -14,4 +14,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetCurrent.3 fontconfig-2.11.0/doc/FcConfigGetCurrent.3 --- fontconfig-2.10.93/doc/FcConfigGetCurrent.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetCurrent.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetCurrent" "3" "20 5月 2013" "" "" +.TH "FcConfigGetCurrent" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetCurrent \- Return current configuration .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the current default configuration. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetFontDirs.3 fontconfig-2.11.0/doc/FcConfigGetFontDirs.3 --- fontconfig-2.10.93/doc/FcConfigGetFontDirs.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetFontDirs.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetFontDirs" "3" "20 5月 2013" "" "" +.TH "FcConfigGetFontDirs" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetFontDirs \- Get font directories .SH SYNOPSIS @@ -16,4 +16,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetFonts.3 fontconfig-2.11.0/doc/FcConfigGetFonts.3 --- fontconfig-2.10.93/doc/FcConfigGetFonts.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetFonts.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetFonts" "3" "20 5月 2013" "" "" +.TH "FcConfigGetFonts" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetFonts \- Get config font set .SH SYNOPSIS @@ -16,4 +16,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetRescanInterval.3 fontconfig-2.11.0/doc/FcConfigGetRescanInterval.3 --- fontconfig-2.10.93/doc/FcConfigGetRescanInterval.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetRescanInterval.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetRescanInterval" "3" "20 5月 2013" "" "" +.TH "FcConfigGetRescanInterval" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetRescanInterval \- Get config rescan interval .SH SYNOPSIS @@ -17,4 +17,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigGetSysRoot.3 fontconfig-2.11.0/doc/FcConfigGetSysRoot.3 --- fontconfig-2.10.93/doc/FcConfigGetSysRoot.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigGetSysRoot.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigGetSysRoot" "3" "20 5月 2013" "" "" +.TH "FcConfigGetSysRoot" "3" "11 10月 2013" "" "" .SH NAME FcConfigGetSysRoot \- Obtain the system root directory .SH SYNOPSIS @@ -13,4 +13,4 @@ Obtrains the system root directory in 'config' if available. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigHome.3 fontconfig-2.11.0/doc/FcConfigHome.3 --- fontconfig-2.10.93/doc/FcConfigHome.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigHome.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigHome" "3" "20 5月 2013" "" "" +.TH "FcConfigHome" "3" "11 10月 2013" "" "" .SH NAME FcConfigHome \- return the current home directory. .SH SYNOPSIS @@ -15,4 +15,4 @@ See also \fBFcConfigEnableHome\fR). .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigParseAndLoad.3 fontconfig-2.11.0/doc/FcConfigParseAndLoad.3 --- fontconfig-2.10.93/doc/FcConfigParseAndLoad.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigParseAndLoad.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigParseAndLoad" "3" "20 5月 2013" "" "" +.TH "FcConfigParseAndLoad" "3" "11 10月 2013" "" "" .SH NAME FcConfigParseAndLoad \- load a configuration file .SH SYNOPSIS @@ -18,4 +18,4 @@ parse error, semantic error or allocation failure. Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigReference.3 fontconfig-2.11.0/doc/FcConfigReference.3 --- fontconfig-2.10.93/doc/FcConfigReference.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigReference.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigReference" "3" "20 5月 2013" "" "" +.TH "FcConfigReference" "3" "11 10月 2013" "" "" .SH NAME FcConfigReference \- Increment config reference count .SH SYNOPSIS @@ -18,4 +18,4 @@ for destroying the configuration when not needed anymore. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigSetCurrent.3 fontconfig-2.11.0/doc/FcConfigSetCurrent.3 --- fontconfig-2.10.93/doc/FcConfigSetCurrent.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigSetCurrent.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigSetCurrent" "3" "20 5月 2013" "" "" +.TH "FcConfigSetCurrent" "3" "11 10月 2013" "" "" .SH NAME FcConfigSetCurrent \- Set configuration as default .SH SYNOPSIS @@ -14,4 +14,4 @@ FcConfigBuildFonts if necessary, returning FcFalse if that call fails. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigSetRescanInterval.3 fontconfig-2.11.0/doc/FcConfigSetRescanInterval.3 --- fontconfig-2.10.93/doc/FcConfigSetRescanInterval.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigSetRescanInterval.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigSetRescanInterval" "3" "20 5月 2013" "" "" +.TH "FcConfigSetRescanInterval" "3" "11 10月 2013" "" "" .SH NAME FcConfigSetRescanInterval \- Set config rescan interval .SH SYNOPSIS @@ -16,4 +16,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigSetSysRoot.3 fontconfig-2.11.0/doc/FcConfigSetSysRoot.3 --- fontconfig-2.10.93/doc/FcConfigSetSysRoot.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigSetSysRoot.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigSetSysRoot" "3" "20 5月 2013" "" "" +.TH "FcConfigSetSysRoot" "3" "11 10月 2013" "" "" .SH NAME FcConfigSetSysRoot \- Set the system root directory .SH SYNOPSIS @@ -16,4 +16,4 @@ this function calls FcConfigSetCurrent() internally. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigSubstitute.3 fontconfig-2.11.0/doc/FcConfigSubstitute.3 --- fontconfig-2.10.93/doc/FcConfigSubstitute.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigSubstitute.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigSubstitute" "3" "20 5月 2013" "" "" +.TH "FcConfigSubstitute" "3" "11 10月 2013" "" "" .SH NAME FcConfigSubstitute \- Execute substitutions .SH SYNOPSIS @@ -15,4 +15,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigSubstituteWithPat.3 fontconfig-2.11.0/doc/FcConfigSubstituteWithPat.3 --- fontconfig-2.10.93/doc/FcConfigSubstituteWithPat.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigSubstituteWithPat.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigSubstituteWithPat" "3" "20 5月 2013" "" "" +.TH "FcConfigSubstituteWithPat" "3" "11 10月 2013" "" "" .SH NAME FcConfigSubstituteWithPat \- Execute substitutions .SH SYNOPSIS @@ -18,4 +18,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcConfigUptoDate.3 fontconfig-2.11.0/doc/FcConfigUptoDate.3 --- fontconfig-2.10.93/doc/FcConfigUptoDate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcConfigUptoDate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcConfigUptoDate" "3" "20 5月 2013" "" "" +.TH "FcConfigUptoDate" "3" "11 10月 2013" "" "" .SH NAME FcConfigUptoDate \- Check timestamps on config files .SH SYNOPSIS @@ -15,4 +15,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDefaultSubstitute.3 fontconfig-2.11.0/doc/FcDefaultSubstitute.3 --- fontconfig-2.10.93/doc/FcDefaultSubstitute.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDefaultSubstitute.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDefaultSubstitute" "3" "20 5月 2013" "" "" +.TH "FcDefaultSubstitute" "3" "11 10月 2013" "" "" .SH NAME FcDefaultSubstitute \- Perform default substitutions in a pattern .SH SYNOPSIS @@ -24,4 +24,4 @@ .PP .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheClean.3 fontconfig-2.11.0/doc/FcDirCacheClean.3 --- fontconfig-2.10.93/doc/FcDirCacheClean.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheClean.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheClean" "3" "20 5月 2013" "" "" +.TH "FcDirCacheClean" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheClean \- This tries to clean up the cache directory of cache_dir.This returns FcTrue if the operation is successfully complete. otherwise FcFalse. .SH SYNOPSIS @@ -12,4 +12,4 @@ .PP .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheLoad.3 fontconfig-2.11.0/doc/FcDirCacheLoad.3 --- fontconfig-2.10.93/doc/FcDirCacheLoad.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheLoad.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheLoad" "3" "20 5月 2013" "" "" +.TH "FcDirCacheLoad" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheLoad \- load a directory cache .SH SYNOPSIS @@ -16,4 +16,4 @@ FcDirCacheRead. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheLoadFile.3 fontconfig-2.11.0/doc/FcDirCacheLoadFile.3 --- fontconfig-2.10.93/doc/FcDirCacheLoadFile.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheLoadFile.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheLoadFile" "3" "20 5月 2013" "" "" +.TH "FcDirCacheLoadFile" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheLoadFile \- load a cache file .SH SYNOPSIS @@ -15,4 +15,4 @@ non-NULL, it will be filled with the results of stat(2) on the cache file. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheRead.3 fontconfig-2.11.0/doc/FcDirCacheRead.3 --- fontconfig-2.10.93/doc/FcDirCacheRead.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheRead.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheRead" "3" "20 5月 2013" "" "" +.TH "FcDirCacheRead" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheRead \- read or construct a directory cache .SH SYNOPSIS @@ -16,4 +16,4 @@ directory and that returned. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheUnlink.3 fontconfig-2.11.0/doc/FcDirCacheUnlink.3 --- fontconfig-2.10.93/doc/FcDirCacheUnlink.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheUnlink.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheUnlink" "3" "20 5月 2013" "" "" +.TH "FcDirCacheUnlink" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheUnlink \- Remove all caches related to dir .SH SYNOPSIS @@ -16,4 +16,4 @@ unlinking any files are ignored. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheUnload.3 fontconfig-2.11.0/doc/FcDirCacheUnload.3 --- fontconfig-2.10.93/doc/FcDirCacheUnload.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheUnload.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheUnload" "3" "20 5月 2013" "" "" +.TH "FcDirCacheUnload" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheUnload \- unload a cache file .SH SYNOPSIS @@ -14,4 +14,4 @@ references to it remain, all memory associated with the cache will be freed. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirCacheValid.3 fontconfig-2.11.0/doc/FcDirCacheValid.3 --- fontconfig-2.10.93/doc/FcDirCacheValid.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirCacheValid.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirCacheValid" "3" "20 5月 2013" "" "" +.TH "FcDirCacheValid" "3" "11 10月 2013" "" "" .SH NAME FcDirCacheValid \- check directory cache .SH SYNOPSIS @@ -14,4 +14,4 @@ file, else returns FcFalse .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirSave.3 fontconfig-2.11.0/doc/FcDirSave.3 --- fontconfig-2.10.93/doc/FcDirSave.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirSave.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirSave" "3" "20 5月 2013" "" "" +.TH "FcDirSave" "3" "11 10月 2013" "" "" .SH NAME FcDirSave \- DEPRECATED: formerly used to save a directory cache .SH SYNOPSIS @@ -17,4 +17,4 @@ managed by FcDirCacheLoad and FcDirCacheRead. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcDirScan.3 fontconfig-2.11.0/doc/FcDirScan.3 --- fontconfig-2.10.93/doc/FcDirScan.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcDirScan.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcDirScan" "3" "20 5月 2013" "" "" +.TH "FcDirScan" "3" "11 10月 2013" "" "" .SH NAME FcDirScan \- scan a font directory without caching it .SH SYNOPSIS @@ -18,4 +18,4 @@ caching is desired. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFileIsDir.3 fontconfig-2.11.0/doc/FcFileIsDir.3 --- fontconfig-2.10.93/doc/FcFileIsDir.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFileIsDir.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFileIsDir" "3" "20 5月 2013" "" "" +.TH "FcFileIsDir" "3" "11 10月 2013" "" "" .SH NAME FcFileIsDir \- check whether a file is a directory .SH SYNOPSIS @@ -14,4 +14,4 @@ returns FcFalse. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFileScan.3 fontconfig-2.11.0/doc/FcFileScan.3 --- fontconfig-2.10.93/doc/FcFileScan.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFileScan.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFileScan" "3" "20 5月 2013" "" "" +.TH "FcFileScan" "3" "11 10月 2013" "" "" .SH NAME FcFileScan \- scan a font file .SH SYNOPSIS @@ -23,4 +23,4 @@ added (due to allocation failure). Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFini.3 fontconfig-2.11.0/doc/FcFini.3 --- fontconfig-2.10.93/doc/FcFini.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFini.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFini" "3" "20 5月 2013" "" "" +.TH "FcFini" "3" "11 10月 2013" "" "" .SH NAME FcFini \- finalize fontconfig library .SH SYNOPSIS @@ -16,4 +16,4 @@ function may be called. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontList.3 fontconfig-2.11.0/doc/FcFontList.3 --- fontconfig-2.10.93/doc/FcFontList.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontList.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontList" "3" "20 5月 2013" "" "" +.TH "FcFontList" "3" "11 10月 2013" "" "" .SH NAME FcFontList \- List fonts .SH SYNOPSIS @@ -16,4 +16,4 @@ to be up to date, and used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontMatch.3 fontconfig-2.11.0/doc/FcFontMatch.3 --- fontconfig-2.10.93/doc/FcFontMatch.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontMatch.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontMatch" "3" "20 5月 2013" "" "" +.TH "FcFontMatch" "3" "11 10月 2013" "" "" .SH NAME FcFontMatch \- Return best font .SH SYNOPSIS @@ -20,4 +20,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontRenderPrepare.3 fontconfig-2.11.0/doc/FcFontRenderPrepare.3 --- fontconfig-2.10.93/doc/FcFontRenderPrepare.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontRenderPrepare.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontRenderPrepare" "3" "20 5月 2013" "" "" +.TH "FcFontRenderPrepare" "3" "11 10月 2013" "" "" .SH NAME FcFontRenderPrepare \- Prepare pattern for loading font file .SH SYNOPSIS @@ -16,4 +16,4 @@ FcConfigSubstituteWithPat with \fIkind\fR FcMatchFont and then returned. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetAdd.3 fontconfig-2.11.0/doc/FcFontSetAdd.3 --- fontconfig-2.10.93/doc/FcFontSetAdd.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetAdd.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetAdd" "3" "20 5月 2013" "" "" +.TH "FcFontSetAdd" "3" "11 10月 2013" "" "" .SH NAME FcFontSetAdd \- Add to a font set .SH SYNOPSIS @@ -15,4 +15,4 @@ inserted into the set (due to allocation failure). Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetCreate.3 fontconfig-2.11.0/doc/FcFontSetCreate.3 --- fontconfig-2.10.93/doc/FcFontSetCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetCreate" "3" "20 5月 2013" "" "" +.TH "FcFontSetCreate" "3" "11 10月 2013" "" "" .SH NAME FcFontSetCreate \- Create a font set .SH SYNOPSIS @@ -13,4 +13,4 @@ Creates an empty font set. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetDestroy.3 fontconfig-2.11.0/doc/FcFontSetDestroy.3 --- fontconfig-2.10.93/doc/FcFontSetDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetDestroy" "3" "20 5月 2013" "" "" +.TH "FcFontSetDestroy" "3" "11 10月 2013" "" "" .SH NAME FcFontSetDestroy \- Destroy a font set .SH SYNOPSIS @@ -14,4 +14,4 @@ well. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetList.3 fontconfig-2.11.0/doc/FcFontSetList.3 --- fontconfig-2.10.93/doc/FcFontSetList.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetList.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetList" "3" "20 5月 2013" "" "" +.TH "FcFontSetList" "3" "11 10月 2013" "" "" .SH NAME FcFontSetList \- List fonts from a set of font sets .SH SYNOPSIS @@ -18,4 +18,4 @@ to be up to date, and used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetMatch.3 fontconfig-2.11.0/doc/FcFontSetMatch.3 --- fontconfig-2.10.93/doc/FcFontSetMatch.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetMatch.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetMatch" "3" "20 5月 2013" "" "" +.TH "FcFontSetMatch" "3" "11 10月 2013" "" "" .SH NAME FcFontSetMatch \- Return the best font from a set of font sets .SH SYNOPSIS @@ -21,4 +21,4 @@ Returns NULL if an error occurs during this process. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetPrint.3 fontconfig-2.11.0/doc/FcFontSetPrint.3 --- fontconfig-2.10.93/doc/FcFontSetPrint.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetPrint.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetPrint" "3" "20 5月 2013" "" "" +.TH "FcFontSetPrint" "3" "11 10月 2013" "" "" .SH NAME FcFontSetPrint \- Print a set of patterns to stdout .SH SYNOPSIS @@ -16,4 +16,4 @@ change at any time. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetSort.3 fontconfig-2.11.0/doc/FcFontSetSort.3 --- fontconfig-2.10.93/doc/FcFontSetSort.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetSort.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetSort" "3" "20 5月 2013" "" "" +.TH "FcFontSetSort" "3" "11 10月 2013" "" "" .SH NAME FcFontSetSort \- Add to a font set .SH SYNOPSIS @@ -30,4 +30,4 @@ The FcFontSet returned by FcFontSetSort is destroyed by calling FcFontSetDestroy. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSetSortDestroy.3 fontconfig-2.11.0/doc/FcFontSetSortDestroy.3 --- fontconfig-2.10.93/doc/FcFontSetSortDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSetSortDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSetSortDestroy" "3" "20 5月 2013" "" "" +.TH "FcFontSetSortDestroy" "3" "11 10月 2013" "" "" .SH NAME FcFontSetSortDestroy \- DEPRECATED destroy a font set .SH SYNOPSIS @@ -16,4 +16,4 @@ \fBFcFontSetDestroy\fR directly instead. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFontSort.3 fontconfig-2.11.0/doc/FcFontSort.3 --- fontconfig-2.10.93/doc/FcFontSort.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFontSort.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFontSort" "3" "20 5月 2013" "" "" +.TH "FcFontSort" "3" "11 10月 2013" "" "" .SH NAME FcFontSort \- Return list of matching fonts .SH SYNOPSIS @@ -26,4 +26,4 @@ If \fIconfig\fR is NULL, the current configuration is used. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFreeTypeCharIndex.3 fontconfig-2.11.0/doc/FcFreeTypeCharIndex.3 --- fontconfig-2.10.93/doc/FcFreeTypeCharIndex.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFreeTypeCharIndex.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFreeTypeCharIndex" "3" "20 5月 2013" "" "" +.TH "FcFreeTypeCharIndex" "3" "11 10月 2013" "" "" .SH NAME FcFreeTypeCharIndex \- map Unicode to glyph id .SH SYNOPSIS @@ -18,4 +18,4 @@ higher level functions. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFreeTypeCharSet.3 fontconfig-2.11.0/doc/FcFreeTypeCharSet.3 --- fontconfig-2.10.93/doc/FcFreeTypeCharSet.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFreeTypeCharSet.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFreeTypeCharSet" "3" "20 5月 2013" "" "" +.TH "FcFreeTypeCharSet" "3" "11 10月 2013" "" "" .SH NAME FcFreeTypeCharSet \- compute Unicode coverage .SH SYNOPSIS @@ -17,4 +17,4 @@ not in 'blanks' are not placed in the returned FcCharSet. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFreeTypeCharSetAndSpacing.3 fontconfig-2.11.0/doc/FcFreeTypeCharSetAndSpacing.3 --- fontconfig-2.10.93/doc/FcFreeTypeCharSetAndSpacing.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFreeTypeCharSetAndSpacing.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFreeTypeCharSetAndSpacing" "3" "20 5月 2013" "" "" +.TH "FcFreeTypeCharSetAndSpacing" "3" "11 10月 2013" "" "" .SH NAME FcFreeTypeCharSetAndSpacing \- compute Unicode coverage and spacing type .SH SYNOPSIS @@ -23,4 +23,4 @@ widths. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFreeTypeQuery.3 fontconfig-2.11.0/doc/FcFreeTypeQuery.3 --- fontconfig-2.10.93/doc/FcFreeTypeQuery.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFreeTypeQuery.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFreeTypeQuery" "3" "20 5月 2013" "" "" +.TH "FcFreeTypeQuery" "3" "11 10月 2013" "" "" .SH NAME FcFreeTypeQuery \- compute pattern from font file (and index) .SH SYNOPSIS @@ -15,4 +15,4 @@ of fonts in 'file' is returned in 'count'. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcFreeTypeQueryFace.3 fontconfig-2.11.0/doc/FcFreeTypeQueryFace.3 --- fontconfig-2.10.93/doc/FcFreeTypeQueryFace.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcFreeTypeQueryFace.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcFreeTypeQueryFace" "3" "20 5月 2013" "" "" +.TH "FcFreeTypeQueryFace" "3" "11 10月 2013" "" "" .SH NAME FcFreeTypeQueryFace \- compute pattern from FT_Face .SH SYNOPSIS @@ -15,4 +15,4 @@ data for pattern elements (FC_FILE, FC_INDEX and sometimes FC_FAMILY). .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcGetDefaultLangs.3 fontconfig-2.11.0/doc/FcGetDefaultLangs.3 --- fontconfig-2.10.93/doc/FcGetDefaultLangs.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcGetDefaultLangs.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcGetDefaultLangs" "3" "20 5月 2013" "" "" +.TH "FcGetDefaultLangs" "3" "11 10月 2013" "" "" .SH NAME FcGetDefaultLangs \- Get the default languages list .SH SYNOPSIS @@ -15,4 +15,4 @@ If there are no valid values in those environment variables, "en" will be set as fallback. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcGetLangs.3 fontconfig-2.11.0/doc/FcGetLangs.3 --- fontconfig-2.10.93/doc/FcGetLangs.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcGetLangs.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcGetLangs" "3" "20 5月 2013" "" "" +.TH "FcGetLangs" "3" "11 10月 2013" "" "" .SH NAME FcGetLangs \- Get list of languages .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns a string set of all known languages. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcGetVersion.3 fontconfig-2.11.0/doc/FcGetVersion.3 --- fontconfig-2.10.93/doc/FcGetVersion.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcGetVersion.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcGetVersion" "3" "20 5月 2013" "" "" +.TH "FcGetVersion" "3" "11 10月 2013" "" "" .SH NAME FcGetVersion \- library version number .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the version number of the library. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcInit.3 fontconfig-2.11.0/doc/FcInit.3 --- fontconfig-2.10.93/doc/FcInit.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcInit.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcInit" "3" "20 5月 2013" "" "" +.TH "FcInit" "3" "11 10月 2013" "" "" .SH NAME FcInit \- initialize fontconfig library .SH SYNOPSIS @@ -16,4 +16,4 @@ been loaded, this routine does nothing and returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcInitBringUptoDate.3 fontconfig-2.11.0/doc/FcInitBringUptoDate.3 --- fontconfig-2.10.93/doc/FcInitBringUptoDate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcInitBringUptoDate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcInitBringUptoDate" "3" "20 5月 2013" "" "" +.TH "FcInitBringUptoDate" "3" "11 10月 2013" "" "" .SH NAME FcInitBringUptoDate \- reload configuration files if needed .SH SYNOPSIS @@ -16,4 +16,4 @@ be reloaded (see FcInitReinitialize). Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcInitLoadConfig.3 fontconfig-2.11.0/doc/FcInitLoadConfig.3 --- fontconfig-2.10.93/doc/FcInitLoadConfig.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcInitLoadConfig.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcInitLoadConfig" "3" "20 5月 2013" "" "" +.TH "FcInitLoadConfig" "3" "11 10月 2013" "" "" .SH NAME FcInitLoadConfig \- load configuration .SH SYNOPSIS @@ -14,4 +14,4 @@ Does not load any font information. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcInitLoadConfigAndFonts.3 fontconfig-2.11.0/doc/FcInitLoadConfigAndFonts.3 --- fontconfig-2.10.93/doc/FcInitLoadConfigAndFonts.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcInitLoadConfigAndFonts.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcInitLoadConfigAndFonts" "3" "20 5月 2013" "" "" +.TH "FcInitLoadConfigAndFonts" "3" "11 10月 2013" "" "" .SH NAME FcInitLoadConfigAndFonts \- load configuration and font data .SH SYNOPSIS @@ -14,4 +14,4 @@ available fonts. Returns the resulting configuration. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcInitReinitialize.3 fontconfig-2.11.0/doc/FcInitReinitialize.3 --- fontconfig-2.10.93/doc/FcInitReinitialize.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcInitReinitialize.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcInitReinitialize" "3" "20 5月 2013" "" "" +.TH "FcInitReinitialize" "3" "11 10月 2013" "" "" .SH NAME FcInitReinitialize \- re-initialize library .SH SYNOPSIS @@ -16,4 +16,4 @@ existing configuration unchanged. Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcIsLower.3 fontconfig-2.11.0/doc/FcIsLower.3 --- fontconfig-2.10.93/doc/FcIsLower.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcIsLower.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcIsLower" "3" "20 5月 2013" "" "" +.TH "FcIsLower" "3" "11 10月 2013" "" "" .SH NAME FcIsLower \- check for lower case ASCII character .SH SYNOPSIS @@ -14,4 +14,4 @@ letter. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcIsUpper.3 fontconfig-2.11.0/doc/FcIsUpper.3 --- fontconfig-2.10.93/doc/FcIsUpper.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcIsUpper.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcIsUpper" "3" "20 5月 2013" "" "" +.TH "FcIsUpper" "3" "11 10月 2013" "" "" .SH NAME FcIsUpper \- check for upper case ASCII character .SH SYNOPSIS @@ -14,4 +14,4 @@ letter. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangGetCharSet.3 fontconfig-2.11.0/doc/FcLangGetCharSet.3 --- fontconfig-2.10.93/doc/FcLangGetCharSet.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangGetCharSet.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangGetCharSet" "3" "20 5月 2013" "" "" +.TH "FcLangGetCharSet" "3" "11 10月 2013" "" "" .SH NAME FcLangGetCharSet \- Get character map for a language .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns the FcCharMap for a language. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangNormalize.3 fontconfig-2.11.0/doc/FcLangNormalize.3 --- fontconfig-2.10.93/doc/FcLangNormalize.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangNormalize.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangNormalize" "3" "20 5月 2013" "" "" +.TH "FcLangNormalize" "3" "11 10月 2013" "" "" .SH NAME FcLangNormalize \- Normalize the language string .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns a string to make \fIlang\fR suitable on fontconfig. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetAdd.3 fontconfig-2.11.0/doc/FcLangSetAdd.3 --- fontconfig-2.10.93/doc/FcLangSetAdd.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetAdd.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetAdd" "3" "20 5月 2013" "" "" +.TH "FcLangSetAdd" "3" "11 10月 2013" "" "" .SH NAME FcLangSetAdd \- add a language to a langset .SH SYNOPSIS @@ -16,4 +16,4 @@ 3166. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetCompare.3 fontconfig-2.11.0/doc/FcLangSetCompare.3 --- fontconfig-2.10.93/doc/FcLangSetCompare.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetCompare.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetCompare" "3" "20 5月 2013" "" "" +.TH "FcLangSetCompare" "3" "11 10月 2013" "" "" .SH NAME FcLangSetCompare \- compare language sets .SH SYNOPSIS @@ -18,4 +18,4 @@ common, this function returns FcLangDifferentLang. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetContains.3 fontconfig-2.11.0/doc/FcLangSetContains.3 --- fontconfig-2.10.93/doc/FcLangSetContains.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetContains.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetContains" "3" "20 5月 2013" "" "" +.TH "FcLangSetContains" "3" "11 10月 2013" "" "" .SH NAME FcLangSetContains \- check langset subset relation .SH SYNOPSIS @@ -18,4 +18,4 @@ \fIls_a\fR has no territory. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetCopy.3 fontconfig-2.11.0/doc/FcLangSetCopy.3 --- fontconfig-2.10.93/doc/FcLangSetCopy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetCopy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetCopy" "3" "20 5月 2013" "" "" +.TH "FcLangSetCopy" "3" "11 10月 2013" "" "" .SH NAME FcLangSetCopy \- copy a langset object .SH SYNOPSIS @@ -14,4 +14,4 @@ populates it with the contents of \fIls\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetCreate.3 fontconfig-2.11.0/doc/FcLangSetCreate.3 --- fontconfig-2.10.93/doc/FcLangSetCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetCreate" "3" "20 5月 2013" "" "" +.TH "FcLangSetCreate" "3" "11 10月 2013" "" "" .SH NAME FcLangSetCreate \- create a langset object .SH SYNOPSIS @@ -13,4 +13,4 @@ \fBFcLangSetCreate\fR creates a new FcLangSet object. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetDel.3 fontconfig-2.11.0/doc/FcLangSetDel.3 --- fontconfig-2.10.93/doc/FcLangSetDel.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetDel.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetDel" "3" "20 5月 2013" "" "" +.TH "FcLangSetDel" "3" "11 10月 2013" "" "" .SH NAME FcLangSetDel \- delete a language from a langset .SH SYNOPSIS @@ -16,4 +16,4 @@ 3166. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetDestroy.3 fontconfig-2.11.0/doc/FcLangSetDestroy.3 --- fontconfig-2.10.93/doc/FcLangSetDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetDestroy" "3" "20 5月 2013" "" "" +.TH "FcLangSetDestroy" "3" "11 10月 2013" "" "" .SH NAME FcLangSetDestroy \- destroy a langset object .SH SYNOPSIS @@ -14,4 +14,4 @@ all memory associated with it. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetEqual.3 fontconfig-2.11.0/doc/FcLangSetEqual.3 --- fontconfig-2.10.93/doc/FcLangSetEqual.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetEqual.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetEqual" "3" "20 5月 2013" "" "" +.TH "FcLangSetEqual" "3" "11 10月 2013" "" "" .SH NAME FcLangSetEqual \- test for matching langsets .SH SYNOPSIS @@ -14,4 +14,4 @@ the same language and territory combinations as \fIls_b\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetHasLang.3 fontconfig-2.11.0/doc/FcLangSetHasLang.3 --- fontconfig-2.10.93/doc/FcLangSetHasLang.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetHasLang.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetHasLang" "3" "20 5月 2013" "" "" +.TH "FcLangSetHasLang" "3" "11 10月 2013" "" "" .SH NAME FcLangSetHasLang \- test langset for language support .SH SYNOPSIS @@ -19,4 +19,4 @@ has no matching language, this function returns FcLangDifferentLang. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetHash.3 fontconfig-2.11.0/doc/FcLangSetHash.3 --- fontconfig-2.10.93/doc/FcLangSetHash.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetHash.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetHash" "3" "20 5月 2013" "" "" +.TH "FcLangSetHash" "3" "11 10月 2013" "" "" .SH NAME FcLangSetHash \- return a hash value for a langset .SH SYNOPSIS @@ -17,4 +17,4 @@ value may not be equal. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetSubtract.3 fontconfig-2.11.0/doc/FcLangSetSubtract.3 --- fontconfig-2.10.93/doc/FcLangSetSubtract.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetSubtract.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetSubtract" "3" "20 5月 2013" "" "" +.TH "FcLangSetSubtract" "3" "11 10月 2013" "" "" .SH NAME FcLangSetSubtract \- Subtract langsets .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns a set including only those languages found in \fIls_a\fR but not in \fIls_b\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcLangSetUnion.3 fontconfig-2.11.0/doc/FcLangSetUnion.3 --- fontconfig-2.10.93/doc/FcLangSetUnion.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcLangSetUnion.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcLangSetUnion" "3" "20 5月 2013" "" "" +.TH "FcLangSetUnion" "3" "11 10月 2013" "" "" .SH NAME FcLangSetUnion \- Add langsets .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns a set including only those languages found in either \fIls_a\fR or \fIls_b\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixCopy.3 fontconfig-2.11.0/doc/FcMatrixCopy.3 --- fontconfig-2.10.93/doc/FcMatrixCopy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixCopy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixCopy" "3" "20 5月 2013" "" "" +.TH "FcMatrixCopy" "3" "11 10月 2013" "" "" .SH NAME FcMatrixCopy \- Copy a matrix .SH SYNOPSIS @@ -14,4 +14,4 @@ and copies \fImat\fR into it. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixEqual.3 fontconfig-2.11.0/doc/FcMatrixEqual.3 --- fontconfig-2.10.93/doc/FcMatrixEqual.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixEqual.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixEqual" "3" "20 5月 2013" "" "" +.TH "FcMatrixEqual" "3" "11 10月 2013" "" "" .SH NAME FcMatrixEqual \- Compare two matrices .SH SYNOPSIS @@ -15,4 +15,4 @@ FcFalse when they are not. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixInit.3 fontconfig-2.11.0/doc/FcMatrixInit.3 --- fontconfig-2.10.93/doc/FcMatrixInit.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixInit.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixInit" "3" "20 5月 2013" "" "" +.TH "FcMatrixInit" "3" "11 10月 2013" "" "" .SH NAME FcMatrixInit \- initialize an FcMatrix structure .SH SYNOPSIS @@ -14,4 +14,4 @@ to the identity matrix. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixMultiply.3 fontconfig-2.11.0/doc/FcMatrixMultiply.3 --- fontconfig-2.10.93/doc/FcMatrixMultiply.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixMultiply.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixMultiply" "3" "20 5月 2013" "" "" +.TH "FcMatrixMultiply" "3" "11 10月 2013" "" "" .SH NAME FcMatrixMultiply \- Multiply matrices .SH SYNOPSIS @@ -15,4 +15,4 @@ the result in \fIresult\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixRotate.3 fontconfig-2.11.0/doc/FcMatrixRotate.3 --- fontconfig-2.10.93/doc/FcMatrixRotate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixRotate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixRotate" "3" "20 5月 2013" "" "" +.TH "FcMatrixRotate" "3" "11 10月 2013" "" "" .SH NAME FcMatrixRotate \- Rotate a matrix .SH SYNOPSIS @@ -22,4 +22,4 @@ .fi .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixScale.3 fontconfig-2.11.0/doc/FcMatrixScale.3 --- fontconfig-2.10.93/doc/FcMatrixScale.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixScale.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixScale" "3" "20 5月 2013" "" "" +.TH "FcMatrixScale" "3" "11 10月 2013" "" "" .SH NAME FcMatrixScale \- Scale a matrix .SH SYNOPSIS @@ -22,4 +22,4 @@ .fi .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcMatrixShear.3 fontconfig-2.11.0/doc/FcMatrixShear.3 --- fontconfig-2.10.93/doc/FcMatrixShear.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcMatrixShear.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcMatrixShear" "3" "20 5月 2013" "" "" +.TH "FcMatrixShear" "3" "11 10月 2013" "" "" .SH NAME FcMatrixShear \- Shear a matrix .SH SYNOPSIS @@ -22,4 +22,4 @@ .fi .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameConstant.3 fontconfig-2.11.0/doc/FcNameConstant.3 --- fontconfig-2.10.93/doc/FcNameConstant.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameConstant.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameConstant" "3" "20 5月 2013" "" "" +.TH "FcNameConstant" "3" "11 10月 2013" "" "" .SH NAME FcNameConstant \- Get the value for a symbolic constant .SH SYNOPSIS @@ -14,4 +14,4 @@ placing the value of the constant in \fIresult\fR if present. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameGetConstant.3 fontconfig-2.11.0/doc/FcNameGetConstant.3 --- fontconfig-2.10.93/doc/FcNameGetConstant.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameGetConstant.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameGetConstant" "3" "20 5月 2013" "" "" +.TH "FcNameGetConstant" "3" "11 10月 2013" "" "" .SH NAME FcNameGetConstant \- Lookup symbolic constant .SH SYNOPSIS @@ -13,4 +13,4 @@ Return the FcConstant structure related to symbolic constant \fIstring\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameGetObjectType.3 fontconfig-2.11.0/doc/FcNameGetObjectType.3 --- fontconfig-2.10.93/doc/FcNameGetObjectType.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameGetObjectType.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameGetObjectType" "3" "20 5月 2013" "" "" +.TH "FcNameGetObjectType" "3" "11 10月 2013" "" "" .SH NAME FcNameGetObjectType \- Lookup an object type .SH SYNOPSIS @@ -13,4 +13,4 @@ Return the object type for the pattern element named \fIobject\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameParse.3 fontconfig-2.11.0/doc/FcNameParse.3 --- fontconfig-2.10.93/doc/FcNameParse.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameParse.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameParse" "3" "20 5月 2013" "" "" +.TH "FcNameParse" "3" "11 10月 2013" "" "" .SH NAME FcNameParse \- Parse a pattern string .SH SYNOPSIS @@ -13,4 +13,4 @@ Converts \fIname\fR from the standard text format described above into a pattern. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameRegisterConstants.3 fontconfig-2.11.0/doc/FcNameRegisterConstants.3 --- fontconfig-2.10.93/doc/FcNameRegisterConstants.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameRegisterConstants.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameRegisterConstants" "3" "20 5月 2013" "" "" +.TH "FcNameRegisterConstants" "3" "11 10月 2013" "" "" .SH NAME FcNameRegisterConstants \- Register symbolic constants .SH SYNOPSIS @@ -13,4 +13,4 @@ Deprecated. Does nothing. Returns FcFalse. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameRegisterObjectTypes.3 fontconfig-2.11.0/doc/FcNameRegisterObjectTypes.3 --- fontconfig-2.10.93/doc/FcNameRegisterObjectTypes.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameRegisterObjectTypes.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameRegisterObjectTypes" "3" "20 5月 2013" "" "" +.TH "FcNameRegisterObjectTypes" "3" "11 10月 2013" "" "" .SH NAME FcNameRegisterObjectTypes \- Register object types .SH SYNOPSIS @@ -13,4 +13,4 @@ Deprecated. Does nothing. Returns FcFalse. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameUnparse.3 fontconfig-2.11.0/doc/FcNameUnparse.3 --- fontconfig-2.10.93/doc/FcNameUnparse.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameUnparse.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameUnparse" "3" "20 5月 2013" "" "" +.TH "FcNameUnparse" "3" "11 10月 2013" "" "" .SH NAME FcNameUnparse \- Convert a pattern back into a string that can be parsed .SH SYNOPSIS @@ -15,4 +15,4 @@ which should be freed by the caller using free(). .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameUnregisterConstants.3 fontconfig-2.11.0/doc/FcNameUnregisterConstants.3 --- fontconfig-2.10.93/doc/FcNameUnregisterConstants.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameUnregisterConstants.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameUnregisterConstants" "3" "20 5月 2013" "" "" +.TH "FcNameUnregisterConstants" "3" "11 10月 2013" "" "" .SH NAME FcNameUnregisterConstants \- Unregister symbolic constants .SH SYNOPSIS @@ -13,4 +13,4 @@ Deprecated. Does nothing. Returns FcFalse. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcNameUnregisterObjectTypes.3 fontconfig-2.11.0/doc/FcNameUnregisterObjectTypes.3 --- fontconfig-2.10.93/doc/FcNameUnregisterObjectTypes.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcNameUnregisterObjectTypes.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcNameUnregisterObjectTypes" "3" "20 5月 2013" "" "" +.TH "FcNameUnregisterObjectTypes" "3" "11 10月 2013" "" "" .SH NAME FcNameUnregisterObjectTypes \- Unregister object types .SH SYNOPSIS @@ -13,4 +13,4 @@ Deprecated. Does nothing. Returns FcFalse. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcObjectSetAdd.3 fontconfig-2.11.0/doc/FcObjectSetAdd.3 --- fontconfig-2.10.93/doc/FcObjectSetAdd.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcObjectSetAdd.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcObjectSetAdd" "3" "20 5月 2013" "" "" +.TH "FcObjectSetAdd" "3" "11 10月 2013" "" "" .SH NAME FcObjectSetAdd \- Add to an object set .SH SYNOPSIS @@ -14,4 +14,4 @@ inserted into the set (due to allocation failure). Otherwise returns FcTrue. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcObjectSetBuild.3 fontconfig-2.11.0/doc/FcObjectSetBuild.3 --- fontconfig-2.10.93/doc/FcObjectSetBuild.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcObjectSetBuild.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcObjectSetBuild" "3" "20 5月 2013" "" "" +.TH "FcObjectSetBuild" "3" "11 10月 2013" "" "" .SH NAME FcObjectSetBuild, FcObjectSetVaBuild, FcObjectSetVapBuild \- Build object set from args .SH SYNOPSIS @@ -19,4 +19,4 @@ the result in the \fIresult\fR variable directly. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcObjectSetCreate.3 fontconfig-2.11.0/doc/FcObjectSetCreate.3 --- fontconfig-2.10.93/doc/FcObjectSetCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcObjectSetCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcObjectSetCreate" "3" "20 5月 2013" "" "" +.TH "FcObjectSetCreate" "3" "11 10月 2013" "" "" .SH NAME FcObjectSetCreate \- Create an object set .SH SYNOPSIS @@ -13,4 +13,4 @@ Creates an empty set. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcObjectSetDestroy.3 fontconfig-2.11.0/doc/FcObjectSetDestroy.3 --- fontconfig-2.10.93/doc/FcObjectSetDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcObjectSetDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcObjectSetDestroy" "3" "20 5月 2013" "" "" +.TH "FcObjectSetDestroy" "3" "11 10月 2013" "" "" .SH NAME FcObjectSetDestroy \- Destroy an object set .SH SYNOPSIS @@ -13,4 +13,4 @@ Destroys an object set. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternAdd-Type.3 fontconfig-2.11.0/doc/FcPatternAdd-Type.3 --- fontconfig-2.10.93/doc/FcPatternAdd-Type.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternAdd-Type.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternAdd-Type" "3" "20 5月 2013" "" "" +.TH "FcPatternAdd-Type" "3" "11 10月 2013" "" "" .SH NAME FcPatternAddInteger, FcPatternAddDouble, FcPatternAddString, FcPatternAddMatrix, FcPatternAddCharSet, FcPatternAddBool, FcPatternAddFTFace, FcPatternAddLangSet \- Add a typed value to a pattern .SH SYNOPSIS @@ -30,4 +30,4 @@ any existing list of values. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternAdd.3 fontconfig-2.11.0/doc/FcPatternAdd.3 --- fontconfig-2.10.93/doc/FcPatternAdd.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternAdd.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternAdd" "3" "20 5月 2013" "" "" +.TH "FcPatternAdd" "3" "11 10月 2013" "" "" .SH NAME FcPatternAdd \- Add a value to a pattern .SH SYNOPSIS @@ -17,4 +17,4 @@ retains no reference to any application-supplied data structure. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternAddWeak.3 fontconfig-2.11.0/doc/FcPatternAddWeak.3 --- fontconfig-2.10.93/doc/FcPatternAddWeak.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternAddWeak.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternAddWeak" "3" "20 5月 2013" "" "" +.TH "FcPatternAddWeak" "3" "11 10月 2013" "" "" .SH NAME FcPatternAddWeak \- Add a value to a pattern with weak binding .SH SYNOPSIS @@ -14,4 +14,4 @@ values added to the list have binding \fIweak\fR instead of \fIstrong\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternBuild.3 fontconfig-2.11.0/doc/FcPatternBuild.3 --- fontconfig-2.10.93/doc/FcPatternBuild.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternBuild.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternBuild" "3" "20 5月 2013" "" "" +.TH "FcPatternBuild" "3" "11 10月 2013" "" "" .SH NAME FcPatternBuild, FcPatternVaBuild, FcPatternVapBuild \- Create patterns from arguments .SH SYNOPSIS @@ -43,4 +43,4 @@ .PP .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternCreate.3 fontconfig-2.11.0/doc/FcPatternCreate.3 --- fontconfig-2.10.93/doc/FcPatternCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternCreate" "3" "20 5月 2013" "" "" +.TH "FcPatternCreate" "3" "11 10月 2013" "" "" .SH NAME FcPatternCreate \- Create a pattern .SH SYNOPSIS @@ -13,4 +13,4 @@ Creates a pattern with no properties; used to build patterns from scratch. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternDel.3 fontconfig-2.11.0/doc/FcPatternDel.3 --- fontconfig-2.10.93/doc/FcPatternDel.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternDel.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternDel" "3" "20 5月 2013" "" "" +.TH "FcPatternDel" "3" "11 10月 2013" "" "" .SH NAME FcPatternDel \- Delete a property from a pattern .SH SYNOPSIS @@ -14,4 +14,4 @@ whether the property existed or not. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternDestroy.3 fontconfig-2.11.0/doc/FcPatternDestroy.3 --- fontconfig-2.10.93/doc/FcPatternDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternDestroy" "3" "20 5月 2013" "" "" +.TH "FcPatternDestroy" "3" "11 10月 2013" "" "" .SH NAME FcPatternDestroy \- Destroy a pattern .SH SYNOPSIS @@ -14,4 +14,4 @@ the pattern, in the process destroying all related values. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternDuplicate.3 fontconfig-2.11.0/doc/FcPatternDuplicate.3 --- fontconfig-2.10.93/doc/FcPatternDuplicate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternDuplicate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternDuplicate" "3" "20 5月 2013" "" "" +.TH "FcPatternDuplicate" "3" "11 10月 2013" "" "" .SH NAME FcPatternDuplicate \- Copy a pattern .SH SYNOPSIS @@ -15,4 +15,4 @@ other. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternEqual.3 fontconfig-2.11.0/doc/FcPatternEqual.3 --- fontconfig-2.10.93/doc/FcPatternEqual.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternEqual.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternEqual" "3" "20 5月 2013" "" "" +.TH "FcPatternEqual" "3" "11 10月 2013" "" "" .SH NAME FcPatternEqual \- Compare patterns .SH SYNOPSIS @@ -13,4 +13,4 @@ Returns whether \fIpa\fR and \fIpb\fR are exactly alike. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternEqualSubset.3 fontconfig-2.11.0/doc/FcPatternEqualSubset.3 --- fontconfig-2.10.93/doc/FcPatternEqualSubset.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternEqualSubset.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternEqualSubset" "3" "20 5月 2013" "" "" +.TH "FcPatternEqualSubset" "3" "11 10月 2013" "" "" .SH NAME FcPatternEqualSubset \- Compare portions of patterns .SH SYNOPSIS @@ -14,4 +14,4 @@ objects in \fIos\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternFilter.3 fontconfig-2.11.0/doc/FcPatternFilter.3 --- fontconfig-2.10.93/doc/FcPatternFilter.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternFilter.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternFilter" "3" "20 5月 2013" "" "" +.TH "FcPatternFilter" "3" "11 10月 2013" "" "" .SH NAME FcPatternFilter \- Filter the objects of pattern .SH SYNOPSIS @@ -16,4 +16,4 @@ \fIp\fR is returned. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternFormat.3 fontconfig-2.11.0/doc/FcPatternFormat.3 --- fontconfig-2.10.93/doc/FcPatternFormat.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternFormat.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternFormat" "3" "20 5月 2013" "" "" +.TH "FcPatternFormat" "3" "11 10月 2013" "" "" .SH NAME FcPatternFormat \- Format a pattern into a string according to a format specifier .SH SYNOPSIS @@ -205,4 +205,4 @@ lower-cased and with spaces removed. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternGet-Type.3 fontconfig-2.11.0/doc/FcPatternGet-Type.3 --- fontconfig-2.10.93/doc/FcPatternGet-Type.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternGet-Type.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternGet-Type" "3" "20 5月 2013" "" "" +.TH "FcPatternGet-Type" "3" "11 10月 2013" "" "" .SH NAME FcPatternGetInteger, FcPatternGetDouble, FcPatternGetString, FcPatternGetMatrix, FcPatternGetCharSet, FcPatternGetBool, FcPatternGetFTFace, FcPatternGetLangSet \- Return a typed value from a pattern .SH SYNOPSIS @@ -31,4 +31,4 @@ in preference to FcPatternGet to provide compile-time typechecking. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternGet.3 fontconfig-2.11.0/doc/FcPatternGet.3 --- fontconfig-2.10.93/doc/FcPatternGet.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternGet.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternGet" "3" "20 5月 2013" "" "" +.TH "FcPatternGet" "3" "11 10月 2013" "" "" .SH NAME FcPatternGet \- Return a value from a pattern .SH SYNOPSIS @@ -16,4 +16,4 @@ within the pattern directly. Applications must not free this value. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternHash.3 fontconfig-2.11.0/doc/FcPatternHash.3 --- fontconfig-2.10.93/doc/FcPatternHash.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternHash.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternHash" "3" "20 5月 2013" "" "" +.TH "FcPatternHash" "3" "11 10月 2013" "" "" .SH NAME FcPatternHash \- Compute a pattern hash value .SH SYNOPSIS @@ -14,4 +14,4 @@ equal. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternPrint.3 fontconfig-2.11.0/doc/FcPatternPrint.3 --- fontconfig-2.10.93/doc/FcPatternPrint.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternPrint.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternPrint" "3" "20 5月 2013" "" "" +.TH "FcPatternPrint" "3" "11 10月 2013" "" "" .SH NAME FcPatternPrint \- Print a pattern for debugging .SH SYNOPSIS @@ -15,4 +15,4 @@ and debugging. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternReference.3 fontconfig-2.11.0/doc/FcPatternReference.3 --- fontconfig-2.10.93/doc/FcPatternReference.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternReference.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternReference" "3" "20 5月 2013" "" "" +.TH "FcPatternReference" "3" "11 10月 2013" "" "" .SH NAME FcPatternReference \- Increment pattern reference count .SH SYNOPSIS @@ -14,4 +14,4 @@ when the reference count reaches zero. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcPatternRemove.3 fontconfig-2.11.0/doc/FcPatternRemove.3 --- fontconfig-2.10.93/doc/FcPatternRemove.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcPatternRemove.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcPatternRemove" "3" "20 5月 2013" "" "" +.TH "FcPatternRemove" "3" "11 10月 2013" "" "" .SH NAME FcPatternRemove \- Remove one object of the specified type from the pattern .SH SYNOPSIS @@ -14,4 +14,4 @@ whether the property existed and had a value at that position or not. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrBasename.3 fontconfig-2.11.0/doc/FcStrBasename.3 --- fontconfig-2.10.93/doc/FcStrBasename.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrBasename.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrBasename" "3" "20 5月 2013" "" "" +.TH "FcStrBasename" "3" "11 10月 2013" "" "" .SH NAME FcStrBasename \- last component of filename .SH SYNOPSIS @@ -15,4 +15,4 @@ be freed when no longer needed. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrCmp.3 fontconfig-2.11.0/doc/FcStrCmp.3 --- fontconfig-2.10.93/doc/FcStrCmp.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrCmp.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrCmp" "3" "20 5月 2013" "" "" +.TH "FcStrCmp" "3" "11 10月 2013" "" "" .SH NAME FcStrCmp \- compare UTF-8 strings .SH SYNOPSIS @@ -14,4 +14,4 @@ \fIs1\fR and \fIs2\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrCmpIgnoreCase.3 fontconfig-2.11.0/doc/FcStrCmpIgnoreCase.3 --- fontconfig-2.10.93/doc/FcStrCmpIgnoreCase.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrCmpIgnoreCase.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrCmpIgnoreCase" "3" "20 5月 2013" "" "" +.TH "FcStrCmpIgnoreCase" "3" "11 10月 2013" "" "" .SH NAME FcStrCmpIgnoreCase \- compare UTF-8 strings ignoring case .SH SYNOPSIS @@ -15,4 +15,4 @@ case-insensitive for all proper UTF-8 encoded strings. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrCopy.3 fontconfig-2.11.0/doc/FcStrCopy.3 --- fontconfig-2.10.93/doc/FcStrCopy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrCopy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrCopy" "3" "20 5月 2013" "" "" +.TH "FcStrCopy" "3" "11 10月 2013" "" "" .SH NAME FcStrCopy \- duplicate a string .SH SYNOPSIS @@ -15,4 +15,4 @@ available on every platform. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrCopyFilename.3 fontconfig-2.11.0/doc/FcStrCopyFilename.3 --- fontconfig-2.10.93/doc/FcStrCopyFilename.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrCopyFilename.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrCopyFilename" "3" "20 5月 2013" "" "" +.TH "FcStrCopyFilename" "3" "11 10月 2013" "" "" .SH NAME FcStrCopyFilename \- create a complete path from a filename .SH SYNOPSIS @@ -20,4 +20,4 @@ (see \fBFcConfigEnableHome\fR). .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrDirname.3 fontconfig-2.11.0/doc/FcStrDirname.3 --- fontconfig-2.10.93/doc/FcStrDirname.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrDirname.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrDirname" "3" "20 5月 2013" "" "" +.TH "FcStrDirname" "3" "11 10月 2013" "" "" .SH NAME FcStrDirname \- directory part of filename .SH SYNOPSIS @@ -15,4 +15,4 @@ needed. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrDowncase.3 fontconfig-2.11.0/doc/FcStrDowncase.3 --- fontconfig-2.10.93/doc/FcStrDowncase.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrDowncase.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrDowncase" "3" "20 5月 2013" "" "" +.TH "FcStrDowncase" "3" "11 10月 2013" "" "" .SH NAME FcStrDowncase \- create a lower case translation of a string .SH SYNOPSIS @@ -14,4 +14,4 @@ letters to lower case and returns the allocated buffer. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrFree.3 fontconfig-2.11.0/doc/FcStrFree.3 --- fontconfig-2.10.93/doc/FcStrFree.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrFree.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrFree" "3" "20 5月 2013" "" "" +.TH "FcStrFree" "3" "11 10月 2013" "" "" .SH NAME FcStrFree \- free a string .SH SYNOPSIS @@ -14,4 +14,4 @@ strings within the fontconfig library. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrListCreate.3 fontconfig-2.11.0/doc/FcStrListCreate.3 --- fontconfig-2.10.93/doc/FcStrListCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrListCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrListCreate" "3" "20 5月 2013" "" "" +.TH "FcStrListCreate" "3" "11 10月 2013" "" "" .SH NAME FcStrListCreate \- create a string iterator .SH SYNOPSIS @@ -13,4 +13,4 @@ Creates an iterator to list the strings in \fIset\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrListDone.3 fontconfig-2.11.0/doc/FcStrListDone.3 --- fontconfig-2.10.93/doc/FcStrListDone.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrListDone.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrListDone" "3" "20 5月 2013" "" "" +.TH "FcStrListDone" "3" "11 10月 2013" "" "" .SH NAME FcStrListDone \- destroy a string iterator .SH SYNOPSIS @@ -13,4 +13,4 @@ Destroys the enumerator \fIlist\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrListFirst.3 fontconfig-2.11.0/doc/FcStrListFirst.3 --- fontconfig-2.10.93/doc/FcStrListFirst.3 1970-01-01 00:00:00.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrListFirst.3 2013-10-11 04:29:05.000000000 +0000 @@ -0,0 +1,16 @@ +.\" auto-generated by docbook2man-spec from docbook-utils package +.TH "FcStrListFirst" "3" "11 10月 2013" "" "" +.SH NAME +FcStrListFirst \- get first string in iteration +.SH SYNOPSIS +.nf +\fB#include +.sp +void FcStrListFirst (FcStrList *\fIlist\fB); +.fi\fR +.SH "DESCRIPTION" +.PP +Returns the first string in \fIlist\fR\&. +.SH "VERSION" +.PP +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrListNext.3 fontconfig-2.11.0/doc/FcStrListNext.3 --- fontconfig-2.10.93/doc/FcStrListNext.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrListNext.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrListNext" "3" "20 5月 2013" "" "" +.TH "FcStrListNext" "3" "11 10月 2013" "" "" .SH NAME FcStrListNext \- get next string in iteration .SH SYNOPSIS @@ -10,7 +10,7 @@ .fi\fR .SH "DESCRIPTION" .PP -Returns the next string in \fIset\fR\&. +Returns the next string in \fIlist\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrPlus.3 fontconfig-2.11.0/doc/FcStrPlus.3 --- fontconfig-2.10.93/doc/FcStrPlus.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrPlus.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrPlus" "3" "20 5月 2013" "" "" +.TH "FcStrPlus" "3" "11 10月 2013" "" "" .SH NAME FcStrPlus \- concatenate two strings .SH SYNOPSIS @@ -15,4 +15,4 @@ new string. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetAdd.3 fontconfig-2.11.0/doc/FcStrSetAdd.3 --- fontconfig-2.10.93/doc/FcStrSetAdd.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetAdd.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetAdd" "3" "20 5月 2013" "" "" +.TH "FcStrSetAdd" "3" "11 10月 2013" "" "" .SH NAME FcStrSetAdd \- add to a string set .SH SYNOPSIS @@ -13,4 +13,4 @@ Adds a copy of \fIs\fR to \fIset\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetAddFilename.3 fontconfig-2.11.0/doc/FcStrSetAddFilename.3 --- fontconfig-2.10.93/doc/FcStrSetAddFilename.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetAddFilename.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetAddFilename" "3" "20 5月 2013" "" "" +.TH "FcStrSetAddFilename" "3" "11 10月 2013" "" "" .SH NAME FcStrSetAddFilename \- add a filename to a string set .SH SYNOPSIS @@ -15,4 +15,4 @@ with the value of the HOME environment variable. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetCreate.3 fontconfig-2.11.0/doc/FcStrSetCreate.3 --- fontconfig-2.10.93/doc/FcStrSetCreate.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetCreate.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetCreate" "3" "20 5月 2013" "" "" +.TH "FcStrSetCreate" "3" "11 10月 2013" "" "" .SH NAME FcStrSetCreate \- create a string set .SH SYNOPSIS @@ -13,4 +13,4 @@ Create an empty set. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetDel.3 fontconfig-2.11.0/doc/FcStrSetDel.3 --- fontconfig-2.10.93/doc/FcStrSetDel.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetDel.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetDel" "3" "20 5月 2013" "" "" +.TH "FcStrSetDel" "3" "11 10月 2013" "" "" .SH NAME FcStrSetDel \- delete from a string set .SH SYNOPSIS @@ -14,4 +14,4 @@ FcTrue if \fIs\fR was a member else FcFalse. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetDestroy.3 fontconfig-2.11.0/doc/FcStrSetDestroy.3 --- fontconfig-2.10.93/doc/FcStrSetDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetDestroy" "3" "20 5月 2013" "" "" +.TH "FcStrSetDestroy" "3" "11 10月 2013" "" "" .SH NAME FcStrSetDestroy \- destroy a string set .SH SYNOPSIS @@ -13,4 +13,4 @@ Destroys \fIset\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetEqual.3 fontconfig-2.11.0/doc/FcStrSetEqual.3 --- fontconfig-2.10.93/doc/FcStrSetEqual.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetEqual.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetEqual" "3" "20 5月 2013" "" "" +.TH "FcStrSetEqual" "3" "11 10月 2013" "" "" .SH NAME FcStrSetEqual \- check sets for equality .SH SYNOPSIS @@ -15,4 +15,4 @@ sets is not considered. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrSetMember.3 fontconfig-2.11.0/doc/FcStrSetMember.3 --- fontconfig-2.10.93/doc/FcStrSetMember.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrSetMember.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrSetMember" "3" "20 5月 2013" "" "" +.TH "FcStrSetMember" "3" "11 10月 2013" "" "" .SH NAME FcStrSetMember \- check set for membership .SH SYNOPSIS @@ -14,4 +14,4 @@ \fIset\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrStr.3 fontconfig-2.11.0/doc/FcStrStr.3 --- fontconfig-2.10.93/doc/FcStrStr.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrStr.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrStr" "3" "20 5月 2013" "" "" +.TH "FcStrStr" "3" "11 10月 2013" "" "" .SH NAME FcStrStr \- locate UTF-8 substring .SH SYNOPSIS @@ -16,4 +16,4 @@ with UTF8 encoded strings. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcStrStrIgnoreCase.3 fontconfig-2.11.0/doc/FcStrStrIgnoreCase.3 --- fontconfig-2.10.93/doc/FcStrStrIgnoreCase.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcStrStrIgnoreCase.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcStrStrIgnoreCase" "3" "20 5月 2013" "" "" +.TH "FcStrStrIgnoreCase" "3" "11 10月 2013" "" "" .SH NAME FcStrStrIgnoreCase \- locate UTF-8 substring ignoring ASCII case .SH SYNOPSIS @@ -16,4 +16,4 @@ This test is case-insensitive for all proper UTF-8 encoded strings. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcToLower.3 fontconfig-2.11.0/doc/FcToLower.3 --- fontconfig-2.10.93/doc/FcToLower.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcToLower.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcToLower" "3" "20 5月 2013" "" "" +.TH "FcToLower" "3" "11 10月 2013" "" "" .SH NAME FcToLower \- convert upper case ASCII to lower case .SH SYNOPSIS @@ -14,4 +14,4 @@ equivalent lower case letter. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcUcs4ToUtf8.3 fontconfig-2.11.0/doc/FcUcs4ToUtf8.3 --- fontconfig-2.10.93/doc/FcUcs4ToUtf8.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcUcs4ToUtf8.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcUcs4ToUtf8" "3" "20 5月 2013" "" "" +.TH "FcUcs4ToUtf8" "3" "11 10月 2013" "" "" .SH NAME FcUcs4ToUtf8 \- convert UCS4 to UTF-8 .SH SYNOPSIS @@ -15,4 +15,4 @@ the char. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcUtf16Len.3 fontconfig-2.11.0/doc/FcUtf16Len.3 --- fontconfig-2.10.93/doc/FcUtf16Len.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcUtf16Len.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcUtf16Len" "3" "20 5月 2013" "" "" +.TH "FcUtf16Len" "3" "11 10月 2013" "" "" .SH NAME FcUtf16Len \- count UTF-16 encoded chars .SH SYNOPSIS @@ -20,4 +20,4 @@ string. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcUtf16ToUcs4.3 fontconfig-2.11.0/doc/FcUtf16ToUcs4.3 --- fontconfig-2.10.93/doc/FcUtf16ToUcs4.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcUtf16ToUcs4.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcUtf16ToUcs4" "3" "20 5月 2013" "" "" +.TH "FcUtf16ToUcs4" "3" "11 10月 2013" "" "" .SH NAME FcUtf16ToUcs4 \- convert UTF-16 to UCS4 .SH SYNOPSIS @@ -17,4 +17,4 @@ units according to \fIendian\fR\&. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcUtf8Len.3 fontconfig-2.11.0/doc/FcUtf8Len.3 --- fontconfig-2.10.93/doc/FcUtf8Len.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcUtf8Len.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcUtf8Len" "3" "20 5月 2013" "" "" +.TH "FcUtf8Len" "3" "11 10月 2013" "" "" .SH NAME FcUtf8Len \- count UTF-8 encoded chars .SH SYNOPSIS @@ -18,4 +18,4 @@ well-formed UTF8 string. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcUtf8ToUcs4.3 fontconfig-2.11.0/doc/FcUtf8ToUcs4.3 --- fontconfig-2.10.93/doc/FcUtf8ToUcs4.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcUtf8ToUcs4.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcUtf8ToUcs4" "3" "20 5月 2013" "" "" +.TH "FcUtf8ToUcs4" "3" "11 10月 2013" "" "" .SH NAME FcUtf8ToUcs4 \- convert UTF-8 to UCS4 .SH SYNOPSIS @@ -16,4 +16,4 @@ \fIlen\fR bytes long. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcValueDestroy.3 fontconfig-2.11.0/doc/FcValueDestroy.3 --- fontconfig-2.10.93/doc/FcValueDestroy.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcValueDestroy.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcValueDestroy" "3" "20 5月 2013" "" "" +.TH "FcValueDestroy" "3" "11 10月 2013" "" "" .SH NAME FcValueDestroy \- Free a value .SH SYNOPSIS @@ -14,4 +14,4 @@ FcTypeMatrix and FcTypeCharSet reference memory, the other types do not. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcValueEqual.3 fontconfig-2.11.0/doc/FcValueEqual.3 --- fontconfig-2.10.93/doc/FcValueEqual.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcValueEqual.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcValueEqual" "3" "20 5月 2013" "" "" +.TH "FcValueEqual" "3" "11 10月 2013" "" "" .SH NAME FcValueEqual \- Test two values for equality .SH SYNOPSIS @@ -15,4 +15,4 @@ compared ignoring case. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcValuePrint.3 fontconfig-2.11.0/doc/FcValuePrint.3 --- fontconfig-2.10.93/doc/FcValuePrint.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcValuePrint.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcValuePrint" "3" "20 5月 2013" "" "" +.TH "FcValuePrint" "3" "11 10月 2013" "" "" .SH NAME FcValuePrint \- Print a value to stdout .SH SYNOPSIS @@ -15,4 +15,4 @@ specification as it may change in the future. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/FcValueSave.3 fontconfig-2.11.0/doc/FcValueSave.3 --- fontconfig-2.10.93/doc/FcValueSave.3 2013-05-20 08:44:59.000000000 +0000 +++ fontconfig-2.11.0/doc/FcValueSave.3 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FcValueSave" "3" "20 5月 2013" "" "" +.TH "FcValueSave" "3" "11 10月 2013" "" "" .SH NAME FcValueSave \- Copy a value .SH SYNOPSIS @@ -14,4 +14,4 @@ may be safely destroyed without harming the new value. .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/doc/Makefile.in fontconfig-2.11.0/doc/Makefile.in --- fontconfig-2.10.93/doc/Makefile.in 2013-05-20 08:44:34.000000000 +0000 +++ fontconfig-2.11.0/doc/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -40,23 +40,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -88,7 +116,7 @@ @USEDOCBOOK_TRUE@am__append_3 = $(HTML_DIR)/* @USEDOCBOOK_FALSE@am__append_4 = $(srcdir)/$(HTML_DIR)/* subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/version.sgml.in $(top_srcdir)/depcomp \ $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -190,12 +218,47 @@ NROFF = nroff MANS = $(man3_MANS) $(man5_MANS) DATA = $(doc_DATA) $(htmldoc_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} am__recheck_rx = ^[ ]*:recheck:[ ]* am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* @@ -324,7 +387,7 @@ # '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", # since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.test' and 'test-trs-basic.test'. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ @@ -435,6 +498,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -464,7 +529,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -472,7 +536,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -506,11 +569,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ NULL = EXTRA_DIST = \ $(BUILT_DOCS) \ @@ -682,6 +743,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + edit-sgml$(EXEEXT): $(edit_sgml_OBJECTS) $(edit_sgml_DEPENDENCIES) $(EXTRA_edit_sgml_DEPENDENCIES) @rm -f edit-sgml$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edit_sgml_OBJECTS) $(edit_sgml_LDADD) $(LIBS) @@ -845,26 +907,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(htmldocdir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -876,15 +927,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -893,9 +940,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -920,7 +968,7 @@ $(MAKE) $(AM_MAKEFLAGS) $< # Leading 'am--fnord' is there to ensure the list of targets does not -# exand to empty, as could happen e.g. with make check TESTS=''. +# expand to empty, as could happen e.g. with make check TESTS=''. am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) am--force-recheck: @: @@ -1075,19 +1123,6 @@ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1239,9 +1274,9 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ - clean clean-generic clean-libtool clean-local \ - clean-noinstPROGRAMS cscopelist ctags distclean \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ + check-am clean clean-generic clean-libtool clean-local \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ @@ -1253,7 +1288,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - recheck tags uninstall uninstall-am uninstall-docDATA \ + recheck tags tags-am uninstall uninstall-am uninstall-docDATA \ uninstall-htmldocDATA uninstall-man uninstall-man3 \ uninstall-man5 diff -Nru fontconfig-2.10.93/doc/fccharset.fncs fontconfig-2.11.0/doc/fccharset.fncs --- fontconfig-2.10.93/doc/fccharset.fncs 2012-06-01 02:26:09.000000000 +0000 +++ fontconfig-2.11.0/doc/fccharset.fncs 2013-10-11 03:10:17.000000000 +0000 @@ -175,9 +175,27 @@ @TYPE3@ FcChar32 * @ARG3@ next @PURPOSE@ Start enumerating charset contents @DESC@ -Builds an array of bits marking the first page of Unicode coverage of -a. Returns the base of the array. next contains the next page in the -font. +Builds an array of bits in map marking the +first page of Unicode coverage of a. +*next is set to contains the base code point +for the next page in a. Returns the base code +point for the page, or FC_CHARSET_DONE if +a contains no pages. As an example, if +FcCharSetFirstPage returns +0x300 and fills map with + +0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff7fff 0xffff0003 + +Then the page contains code points 0x300 through +0x33f (the first 64 code points on the page) +because map[0] and +map[1] both have all their bits set. It also +contains code points 0x343 (0x300 + 32*2 ++ (4-1)) and 0x35e (0x300 + +32*2 + (31-1)) because map[2] has +the 4th and 31st bits set. The code points represented by +map[3] and later are left as an excercise for the +reader ;). @@ @RET@ FcChar32 @@ -187,9 +205,15 @@ @TYPE3@ FcChar32 * @ARG3@ next @PURPOSE@ Continue enumerating charset contents @DESC@ -Builds an array of bits marking the Unicode coverage of a for page -*next. Returns the base of the array. next contains the next page in -the font. +Builds an array of bits in map marking the +Unicode coverage of a for page containing +*next (see the +FcCharSetFirstPage description for details). +*next is set to contains the base code point +for the next page in a. Returns the base of +code point for the page, or FC_CHARSET_DONE if +a does not contain +*next. @@ @RET@ FcChar32 diff -Nru fontconfig-2.10.93/doc/fccharset.sgml fontconfig-2.11.0/doc/fccharset.sgml --- fontconfig-2.10.93/doc/fccharset.sgml 2013-04-08 02:42:08.000000000 +0000 +++ fontconfig-2.11.0/doc/fccharset.sgml 2013-10-11 03:39:44.000000000 +0000 @@ -882,9 +882,27 @@ Description -Builds an array of bits marking the first page of Unicode coverage of -a. Returns the base of the array. next contains the next page in the -font. +Builds an array of bits in map marking the +first page of Unicode coverage of a. +*next is set to contains the base code point +for the next page in a. Returns the base code +point for the page, or FC_CHARSET_DONE if +a contains no pages. As an example, if +FcCharSetFirstPage returns +0x300 and fills map with + +0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff7fff 0xffff0003 + +Then the page contains code points 0x300 through +0x33f (the first 64 code points on the page) +because map[0] and +map[1] both have all their bits set. It also +contains code points 0x343 (0x300 + 32*2 ++ (4-1)) and 0x35e (0x300 + +32*2 + (31-1)) because map[2] has +the 4th and 31st bits set. The code points represented by +map[3] and later are left as an excercise for the +reader ;). Version @@ -940,9 +958,15 @@ Description -Builds an array of bits marking the Unicode coverage of a for page -*next. Returns the base of the array. next contains the next page in -the font. +Builds an array of bits in map marking the +Unicode coverage of a for page containing +*next (see the +FcCharSetFirstPage description for details). +*next is set to contains the base code point +for the next page in a. Returns the base of +code point for the page, or FC_CHARSET_DONE if +a does not contain +*next. Version diff -Nru fontconfig-2.10.93/doc/fcstrset.fncs fontconfig-2.11.0/doc/fcstrset.fncs --- fontconfig-2.10.93/doc/fcstrset.fncs 2012-06-01 02:26:09.000000000 +0000 +++ fontconfig-2.11.0/doc/fcstrset.fncs 2013-10-11 03:10:17.000000000 +0000 @@ -98,12 +98,20 @@ Creates an iterator to list the strings in set. @@ +@RET@ void +@FUNC@ FcStrListFirst +@TYPE1@ FcStrList * @ARG1@ list +@PURPOSE@ get first string in iteration +@DESC@ +Returns the first string in list. +@@ + @RET@ FcChar8 * @FUNC@ FcStrListNext @TYPE1@ FcStrList * @ARG1@ list @PURPOSE@ get next string in iteration @DESC@ -Returns the next string in set. +Returns the next string in list. @@ @RET@ void diff -Nru fontconfig-2.10.93/doc/fcstrset.sgml fontconfig-2.11.0/doc/fcstrset.sgml --- fontconfig-2.10.93/doc/fcstrset.sgml 2013-04-08 02:42:08.000000000 +0000 +++ fontconfig-2.11.0/doc/fcstrset.sgml 2013-10-11 03:39:45.000000000 +0000 @@ -464,6 +464,60 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> + + + FcStrListFirst + 3 + + + FcStrListFirst + get first string in iteration + + + + +#include <fontconfig/fontconfig.h> + + + void FcStrListFirst + FcStrList *list + + + + Description + +Returns the first string in list. + + + Version + +Fontconfig version &version; + + + + FcStrListNext @@ -486,7 +540,7 @@ Description -Returns the next string in set. +Returns the next string in list. Version diff -Nru fontconfig-2.10.93/doc/fontconfig-devel/fcatomiccreate.html fontconfig-2.11.0/doc/fontconfig-devel/fcatomiccreate.html --- fontconfig-2.10.93/doc/fontconfig-devel/fcatomiccreate.html 2013-05-20 08:45:09.000000000 +0000 +++ fontconfig-2.11.0/doc/fontconfig-devel/fcatomiccreate.html 2013-10-11 04:29:13.000000000 +0000 @@ -10,7 +10,7 @@ HREF="t1.html">

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Description

Builds an array of bits marking the first page of Unicode coverage of +>Builds an array of bits in map marking the +first page of Unicode coverage of a. *next is set to contains the base code point +for the next page in a. Returns the base of the array. . Returns the base code +point for the page, or FC_CHARSET_DONE if +a contains no pages. As an example, if +FcCharSetFirstPage returns +0x300 and fills map with +

0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff7fff 0xffff0003
+Then the page contains code points 0x300 through +0x33f (the first 64 code points on the page) +because map[0] and +nextmap[1] contains the next page in the -font. +> both have all their bits set. It also +contains code points 0x343 (0x300 + 32*2 ++ (4-1)) and 0x35e (0x300 + +32*2 + (31-1)) because map[2] has +the 4th and 31st bits set. The code points represented by +map[3] and later are left as an excercise for the +reader ;).

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Builds an array of bits marking the Unicode coverage of Builds an array of bits in map marking the +Unicode coverage of a for page +> for page containing *next. Returns the base of the array. (see the +FcCharSetFirstPage description for details). +next*next contains the next page in -the font. +> is set to contains the base code point +for the next page in a. Returns the base of +code point for the page, or FC_CHARSET_DONE if +a does not contain +*next.

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

UpNext >>>

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Next >>>UpFcStrListNextFcStrListFirst

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up +FcStrListFirst
<<< PreviousNext >>>

FcStrListFirst

Name

FcStrListFirst -- get first string in iteration

Synopsis

#include <fontconfig/fontconfig.h>
+

void FcStrListFirst(FcStrList *list);

Description

Returns the first string in list. +

Version

Fontconfig version 2.11.0 + +

<<< PreviousHomeNext >>>
FcStrListCreateUpFcStrListNext
\ No newline at end of file diff -Nru fontconfig-2.10.93/doc/fontconfig-devel/fcstrlistnext.html fontconfig-2.11.0/doc/fontconfig-devel/fcstrlistnext.html --- fontconfig-2.10.93/doc/fontconfig-devel/fcstrlistnext.html 2013-05-20 08:45:09.000000000 +0000 +++ fontconfig-2.11.0/doc/fontconfig-devel/fcstrlistnext.html 2013-10-11 04:29:13.000000000 +0000 @@ -10,10 +10,10 @@ HREF="t1.html"><<< Previous

Name

Synopsis

Description

Returns the next string in setlist.

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

<<< PreviousFcStrListCreateFcStrListFirst

Name

Synopsis

Up

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Name

Synopsis

Description

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Up

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

Fontconfig Developers Reference, Version 2.10.93 +>Fontconfig Developers Reference, Version 2.11.0 Fontconfig Developers Reference, Version 2.10.93Fontconfig Developers Reference, Version 2.11.0

FcLangSet

FcMatrix

FcConfig

FcObjectType

FcConstant

FcBlanks

FcAtomic

File and Directory routines

FcCache routines

FcStrSet and FcStrList

 -- create a string iterator
FcStrListFirst -- get first string in iteration
FcStrListNext -- get next string in iteration

String utilities

pixel @@ -196,6 +196,9 @@ default value of familylang, stylelang and fullnamelang prgname FC_PRGNAME String Name of the running program + hash FC_HASH String SHA256 hash value of the font data + with "sha256:" prefix. + postscriptname FC_POSTSCRIPT_NAME String Font name in PostScript diff -Nru fontconfig-2.10.93/doc/fontconfig-devel.txt fontconfig-2.11.0/doc/fontconfig-devel.txt --- fontconfig-2.10.93/doc/fontconfig-devel.txt 2013-05-20 08:45:01.000000000 +0000 +++ fontconfig-2.11.0/doc/fontconfig-devel.txt 2013-10-11 04:29:06.000000000 +0000 @@ -1,4 +1,4 @@ - Fontconfig Developers Reference, Version 2.10.93 + Fontconfig Developers Reference, Version 2.11.0 Copyright © 2002 Keith Packard @@ -124,7 +124,7 @@ the file ftface FC_FT_FACE FT_Face Use the specified FreeType face object - rasterizer FC_RASTERIZER String Which rasterizer is in use + rasterizer FC_RASTERIZER String Which rasterizer is in use (deprecated) outline FC_OUTLINE Bool Whether the glyphs are outlines scalable FC_SCALABLE Bool Whether glyphs can be scaled scale FC_SCALE Double Scale factor for point->pixel @@ -150,6 +150,9 @@ default value of familylang, stylelang and fullnamelang prgname FC_PRGNAME String Name of the running program + hash FC_HASH String SHA256 hash value of the font data + with "sha256:" prefix. + postscriptname FC_POSTSCRIPT_NAME String Font name in PostScript -------------------------------------------------------------------------- @@ -451,7 +454,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcInitLoadConfigAndFonts @@ -473,7 +476,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcInit @@ -497,7 +500,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFini @@ -521,7 +524,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcGetVersion @@ -542,7 +545,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcInitReinitialize @@ -567,7 +570,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcInitBringUptoDate @@ -591,7 +594,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -666,7 +669,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternDuplicate @@ -688,7 +691,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternReference @@ -710,7 +713,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternDestroy @@ -732,7 +735,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternEqual @@ -753,7 +756,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternEqualSubset @@ -776,7 +779,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternFilter @@ -798,7 +801,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternHash @@ -820,7 +823,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternAdd @@ -846,7 +849,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternAddWeak @@ -869,7 +872,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternAdd-Type @@ -914,7 +917,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternGet @@ -938,7 +941,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternGet-Type @@ -987,7 +990,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternBuild @@ -1033,7 +1036,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternDel @@ -1055,7 +1058,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternRemove @@ -1079,7 +1082,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternPrint @@ -1102,7 +1105,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDefaultSubstitute @@ -1131,7 +1134,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameParse @@ -1153,7 +1156,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameUnparse @@ -1176,7 +1179,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcPatternFormat @@ -1387,7 +1390,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -1433,7 +1436,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetDestroy @@ -1455,7 +1458,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetAdd @@ -1479,7 +1482,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetList @@ -1504,7 +1507,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetMatch @@ -1531,7 +1534,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetPrint @@ -1555,7 +1558,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetSort @@ -1591,7 +1594,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSetSortDestroy @@ -1614,7 +1617,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -1653,7 +1656,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcObjectSetAdd @@ -1676,7 +1679,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcObjectSetDestroy @@ -1697,7 +1700,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcObjectSetBuild @@ -1726,7 +1729,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -1773,7 +1776,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFreeTypeCharSet @@ -1798,7 +1801,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFreeTypeCharSetAndSpacing @@ -1828,7 +1831,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFreeTypeQuery @@ -1852,7 +1855,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFreeTypeQueryFace @@ -1876,7 +1879,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -1917,7 +1920,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcValueSave @@ -1939,7 +1942,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcValuePrint @@ -1962,7 +1965,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcValueEqual @@ -1985,7 +1988,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -2058,7 +2061,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetDestroy @@ -2080,7 +2083,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetAddChar @@ -2103,7 +2106,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetDelChar @@ -2126,7 +2129,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetCopy @@ -2148,7 +2151,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetEqual @@ -2169,7 +2172,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetIntersect @@ -2190,7 +2193,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetUnion @@ -2211,7 +2214,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetSubtract @@ -2232,7 +2235,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetMerge @@ -2256,7 +2259,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetHasChar @@ -2277,7 +2280,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetCount @@ -2298,7 +2301,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetIntersectCount @@ -2319,7 +2322,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetSubtractCount @@ -2340,7 +2343,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetIsSubset @@ -2361,7 +2364,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetFirstPage @@ -2379,12 +2382,24 @@ Description - Builds an array of bits marking the first page of Unicode coverage of a. - Returns the base of the array. next contains the next page in the font. + Builds an array of bits in map marking the first page of Unicode coverage + of a. *next is set to contains the base code point for the next page in a. + Returns the base code point for the page, or FC_CHARSET_DONE if a contains + no pages. As an example, if FcCharSetFirstPage returns 0x300 and fills map + with + +0xffffffff 0xffffffff 0x01000008 0x44300002 0xffffd7f0 0xfffffffb 0xffff7fff 0xffff0003 + + Then the page contains code points 0x300 through 0x33f (the first 64 code + points on the page) because map[0] and map[1] both have all their bits + set. It also contains code points 0x343 (0x300 + 32*2 + (4-1)) and 0x35e + (0x300 + 32*2 + (31-1)) because map[2] has the 4th and 31st bits set. The + code points represented by map[3] and later are left as an excercise for + the reader ;). Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetNextPage @@ -2402,12 +2417,15 @@ Description - Builds an array of bits marking the Unicode coverage of a for page *next. - Returns the base of the array. next contains the next page in the font. + Builds an array of bits in map marking the Unicode coverage of a for page + containing *next (see the FcCharSetFirstPage description for details). + *next is set to contains the base code point for the next page in a. + Returns the base of code point for the page, or FC_CHARSET_DONE if a does + not contain *next. Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetCoverage @@ -2431,7 +2449,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCharSetNew @@ -2452,7 +2470,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -2517,7 +2535,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetDestroy @@ -2539,7 +2557,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetCopy @@ -2561,7 +2579,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetAdd @@ -2583,7 +2601,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetDel @@ -2606,7 +2624,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetUnion @@ -2627,7 +2645,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetSubtract @@ -2650,7 +2668,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetCompare @@ -2676,7 +2694,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetContains @@ -2699,7 +2717,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetEqual @@ -2721,7 +2739,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetHash @@ -2745,7 +2763,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangSetHasLang @@ -2770,7 +2788,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcGetDefaultLangs @@ -2794,7 +2812,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcGetLangs @@ -2815,7 +2833,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangNormalize @@ -2836,7 +2854,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcLangGetCharSet @@ -2857,7 +2875,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -2900,7 +2918,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcMatrixCopy @@ -2921,7 +2939,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcMatrixEqual @@ -2943,7 +2961,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcMatrixMultiply @@ -2966,7 +2984,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcMatrixRotate @@ -2991,7 +3009,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcMatrixScale @@ -3016,7 +3034,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcMatrixShear @@ -3041,7 +3059,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -3135,7 +3153,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigReference @@ -3160,7 +3178,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigDestroy @@ -3184,7 +3202,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigSetCurrent @@ -3206,7 +3224,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetCurrent @@ -3227,7 +3245,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigUptoDate @@ -3250,7 +3268,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigHome @@ -3272,7 +3290,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigEnableHome @@ -3297,7 +3315,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigBuildFonts @@ -3321,7 +3339,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetConfigDirs @@ -3344,7 +3362,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetFontDirs @@ -3367,7 +3385,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetConfigFiles @@ -3389,7 +3407,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetCache @@ -3411,7 +3429,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetCacheDirs @@ -3436,7 +3454,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetFonts @@ -3459,7 +3477,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetBlanks @@ -3483,7 +3501,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetRescanInterval @@ -3508,7 +3526,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigSetRescanInterval @@ -3532,7 +3550,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigAppFontAddFile @@ -3555,7 +3573,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigAppFontAddDir @@ -3579,7 +3597,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigAppFontClear @@ -3601,7 +3619,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigSubstituteWithPat @@ -3629,7 +3647,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigSubstitute @@ -3654,7 +3672,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontMatch @@ -3679,7 +3697,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontSort @@ -3714,7 +3732,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontRenderPrepare @@ -3739,7 +3757,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFontList @@ -3763,7 +3781,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigFilename @@ -3794,7 +3812,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigParseAndLoad @@ -3822,7 +3840,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigGetSysRoot @@ -3843,7 +3861,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcConfigSetSysRoot @@ -3867,7 +3885,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -3903,7 +3921,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameUnregisterObjectTypes @@ -3924,7 +3942,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameGetObjectType @@ -3945,7 +3963,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -3982,7 +4000,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameUnregisterConstants @@ -4003,7 +4021,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameGetConstant @@ -4024,7 +4042,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcNameConstant @@ -4046,7 +4064,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -4087,7 +4105,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcBlanksDestroy @@ -4108,7 +4126,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcBlanksAdd @@ -4130,7 +4148,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcBlanksIsMember @@ -4152,7 +4170,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -4204,7 +4222,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicLock @@ -4226,7 +4244,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicNewFile @@ -4248,7 +4266,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicOrigFile @@ -4269,7 +4287,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicReplaceOrig @@ -4292,7 +4310,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicDeleteNew @@ -4313,7 +4331,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicUnlock @@ -4334,7 +4352,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcAtomicDestroy @@ -4355,7 +4373,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -4415,7 +4433,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcFileIsDir @@ -4436,7 +4454,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirScan @@ -4462,7 +4480,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirSave @@ -4486,7 +4504,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheUnlink @@ -4509,7 +4527,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheValid @@ -4531,7 +4549,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheLoad @@ -4555,7 +4573,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheRead @@ -4579,7 +4597,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheLoadFile @@ -4602,7 +4620,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheUnload @@ -4624,7 +4642,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -4671,7 +4689,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCacheCopySet @@ -4693,7 +4711,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCacheSubdir @@ -4716,7 +4734,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCacheNumSubdir @@ -4737,7 +4755,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCacheNumFont @@ -4759,7 +4777,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcDirCacheClean @@ -4782,7 +4800,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcCacheCreateTagFile @@ -4804,7 +4822,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -4828,9 +4846,11 @@ [170]FcStrListCreate -- create a string iterator - [171]FcStrListNext -- get next string in iteration + [171]FcStrListFirst -- get first string in iteration + + [172]FcStrListNext -- get next string in iteration - [172]FcStrListDone -- destroy a string iterator + [173]FcStrListDone -- destroy a string iterator A data structure for enumerating strings, used to list directories while scanning the configuration as directories are added while scanning. @@ -4854,7 +4874,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrSetMember @@ -4875,7 +4895,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrSetEqual @@ -4897,7 +4917,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrSetAdd @@ -4918,7 +4938,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrSetAddFilename @@ -4941,7 +4961,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrSetDel @@ -4962,7 +4982,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrSetDestroy @@ -4983,7 +5003,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrListCreate @@ -5004,7 +5024,28 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 + + FcStrListFirst + +Name + + FcStrListFirst -- get first string in iteration + +Synopsis + + #include + + + void FcStrListFirst(FcStrList *list); + +Description + + Returns the first string in list. + +Version + + Fontconfig version 2.11.0 FcStrListNext @@ -5021,11 +5062,11 @@ Description - Returns the next string in set. + Returns the next string in list. Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrListDone @@ -5046,7 +5087,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 -------------------------------------------------------------------------- @@ -5054,43 +5095,43 @@ Table of Contents - [173]FcUtf8ToUcs4 -- convert UTF-8 to UCS4 + [174]FcUtf8ToUcs4 -- convert UTF-8 to UCS4 - [174]FcUcs4ToUtf8 -- convert UCS4 to UTF-8 + [175]FcUcs4ToUtf8 -- convert UCS4 to UTF-8 - [175]FcUtf8Len -- count UTF-8 encoded chars + [176]FcUtf8Len -- count UTF-8 encoded chars - [176]FcUtf16ToUcs4 -- convert UTF-16 to UCS4 + [177]FcUtf16ToUcs4 -- convert UTF-16 to UCS4 - [177]FcUtf16Len -- count UTF-16 encoded chars + [178]FcUtf16Len -- count UTF-16 encoded chars - [178]FcIsLower -- check for lower case ASCII character + [179]FcIsLower -- check for lower case ASCII character - [179]FcIsUpper -- check for upper case ASCII character + [180]FcIsUpper -- check for upper case ASCII character - [180]FcToLower -- convert upper case ASCII to lower case + [181]FcToLower -- convert upper case ASCII to lower case - [181]FcStrCopy -- duplicate a string + [182]FcStrCopy -- duplicate a string - [182]FcStrDowncase -- create a lower case translation of a string + [183]FcStrDowncase -- create a lower case translation of a string - [183]FcStrCopyFilename -- create a complete path from a filename + [184]FcStrCopyFilename -- create a complete path from a filename - [184]FcStrCmp -- compare UTF-8 strings + [185]FcStrCmp -- compare UTF-8 strings - [185]FcStrCmpIgnoreCase -- compare UTF-8 strings ignoring case + [186]FcStrCmpIgnoreCase -- compare UTF-8 strings ignoring case - [186]FcStrStr -- locate UTF-8 substring + [187]FcStrStr -- locate UTF-8 substring - [187]FcStrStrIgnoreCase -- locate UTF-8 substring ignoring ASCII case + [188]FcStrStrIgnoreCase -- locate UTF-8 substring ignoring ASCII case - [188]FcStrPlus -- concatenate two strings + [189]FcStrPlus -- concatenate two strings - [189]FcStrFree -- free a string + [190]FcStrFree -- free a string - [190]FcStrDirname -- directory part of filename + [191]FcStrDirname -- directory part of filename - [191]FcStrBasename -- last component of filename + [192]FcStrBasename -- last component of filename Fontconfig manipulates many UTF-8 strings represented with the FcChar8 type. These functions are exposed to help applications deal with these @@ -5116,7 +5157,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcUcs4ToUtf8 @@ -5138,7 +5179,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcUtf8Len @@ -5162,7 +5203,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcUtf16ToUcs4 @@ -5185,7 +5226,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcUtf16Len @@ -5211,7 +5252,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcIsLower @@ -5232,7 +5273,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcIsUpper @@ -5253,7 +5294,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcToLower @@ -5275,7 +5316,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrCopy @@ -5297,7 +5338,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrDowncase @@ -5319,7 +5360,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrCopyFilename @@ -5346,7 +5387,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrCmp @@ -5367,7 +5408,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrCmpIgnoreCase @@ -5389,7 +5430,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrStr @@ -5411,7 +5452,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrStrIgnoreCase @@ -5434,7 +5475,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrPlus @@ -5456,7 +5497,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrFree @@ -5478,7 +5519,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrDirname @@ -5500,7 +5541,7 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 FcStrBasename @@ -5523,199 +5564,200 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 References Visible links - 1. file:///tmp/html-eJSsR7#AEN16 - 2. file:///tmp/html-eJSsR7#AEN19 - 3. file:///tmp/html-eJSsR7#AEN31 - 4. file:///tmp/html-eJSsR7#AEN102 - 5. file:///tmp/html-eJSsR7#FCINITLOADCONFIG - 6. file:///tmp/html-eJSsR7#FCINITLOADCONFIGANDFONTS - 7. file:///tmp/html-eJSsR7#FCINIT - 8. file:///tmp/html-eJSsR7#FCFINI - 9. file:///tmp/html-eJSsR7#FCGETVERSION - 10. file:///tmp/html-eJSsR7#FCINITREINITIALIZE - 11. file:///tmp/html-eJSsR7#FCINITBRINGUPTODATE - 12. file:///tmp/html-eJSsR7#FCPATTERNCREATE - 13. file:///tmp/html-eJSsR7#FCPATTERNDUPLICATE - 14. file:///tmp/html-eJSsR7#FCPATTERNREFERENCE - 15. file:///tmp/html-eJSsR7#FCPATTERNDESTROY - 16. file:///tmp/html-eJSsR7#FCPATTERNEQUAL - 17. file:///tmp/html-eJSsR7#FCPATTERNEQUALSUBSET - 18. file:///tmp/html-eJSsR7#FCPATTERNFILTER - 19. file:///tmp/html-eJSsR7#FCPATTERNHASH - 20. file:///tmp/html-eJSsR7#FCPATTERNADD - 21. file:///tmp/html-eJSsR7#FCPATTERNADDWEAK - 22. file:///tmp/html-eJSsR7#FCPATTERNADD-TYPE - 23. file:///tmp/html-eJSsR7#FCPATTERNGET - 24. file:///tmp/html-eJSsR7#FCPATTERNGET-TYPE - 25. file:///tmp/html-eJSsR7#FCPATTERNBUILD - 26. file:///tmp/html-eJSsR7#FCPATTERNDEL - 27. file:///tmp/html-eJSsR7#FCPATTERNREMOVE - 28. file:///tmp/html-eJSsR7#FCPATTERNPRINT - 29. file:///tmp/html-eJSsR7#FCDEFAULTSUBSTITUTE - 30. file:///tmp/html-eJSsR7#FCNAMEPARSE - 31. file:///tmp/html-eJSsR7#FCNAMEUNPARSE - 32. file:///tmp/html-eJSsR7#FCPATTERNFORMAT - 33. file:///tmp/html-eJSsR7#FCFONTSETCREATE - 34. file:///tmp/html-eJSsR7#FCFONTSETDESTROY - 35. file:///tmp/html-eJSsR7#FCFONTSETADD - 36. file:///tmp/html-eJSsR7#FCFONTSETLIST - 37. file:///tmp/html-eJSsR7#FCFONTSETMATCH - 38. file:///tmp/html-eJSsR7#FCFONTSETPRINT - 39. file:///tmp/html-eJSsR7#FCFONTSETSORT - 40. file:///tmp/html-eJSsR7#FCFONTSETSORTDESTROY - 41. file:///tmp/html-eJSsR7#FCOBJECTSETCREATE - 42. file:///tmp/html-eJSsR7#FCOBJECTSETADD - 43. file:///tmp/html-eJSsR7#FCOBJECTSETDESTROY - 44. file:///tmp/html-eJSsR7#FCOBJECTSETBUILD - 45. file:///tmp/html-eJSsR7#FCFREETYPECHARINDEX - 46. file:///tmp/html-eJSsR7#FCFREETYPECHARSET - 47. file:///tmp/html-eJSsR7#FCFREETYPECHARSETANDSPACING - 48. file:///tmp/html-eJSsR7#FCFREETYPEQUERY - 49. file:///tmp/html-eJSsR7#FCFREETYPEQUERYFACE - 50. file:///tmp/html-eJSsR7#FCVALUEDESTROY - 51. file:///tmp/html-eJSsR7#FCVALUESAVE - 52. file:///tmp/html-eJSsR7#FCVALUEPRINT - 53. file:///tmp/html-eJSsR7#FCVALUEEQUAL - 54. file:///tmp/html-eJSsR7#FCCHARSETCREATE - 55. file:///tmp/html-eJSsR7#FCCHARSETDESTROY - 56. file:///tmp/html-eJSsR7#FCCHARSETADDCHAR - 57. file:///tmp/html-eJSsR7#FCCHARSETDELCHAR - 58. file:///tmp/html-eJSsR7#FCCHARSETCOPY - 59. file:///tmp/html-eJSsR7#FCCHARSETEQUAL - 60. file:///tmp/html-eJSsR7#FCCHARSETINTERSECT - 61. file:///tmp/html-eJSsR7#FCCHARSETUNION - 62. file:///tmp/html-eJSsR7#FCCHARSETSUBTRACT - 63. file:///tmp/html-eJSsR7#FCCHARSETMERGE - 64. file:///tmp/html-eJSsR7#FCCHARSETHASCHAR - 65. file:///tmp/html-eJSsR7#FCCHARSETCOUNT - 66. file:///tmp/html-eJSsR7#FCCHARSETINTERSECTCOUNT - 67. file:///tmp/html-eJSsR7#FCCHARSETSUBTRACTCOUNT - 68. file:///tmp/html-eJSsR7#FCCHARSETISSUBSET - 69. file:///tmp/html-eJSsR7#FCCHARSETFIRSTPAGE - 70. file:///tmp/html-eJSsR7#FCCHARSETNEXTPAGE - 71. file:///tmp/html-eJSsR7#FCCHARSETCOVERAGE - 72. file:///tmp/html-eJSsR7#FCCHARSETNEW - 73. file:///tmp/html-eJSsR7#FCLANGSETCREATE - 74. file:///tmp/html-eJSsR7#FCLANGSETDESTROY - 75. file:///tmp/html-eJSsR7#FCLANGSETCOPY - 76. file:///tmp/html-eJSsR7#FCLANGSETADD - 77. file:///tmp/html-eJSsR7#FCLANGSETDEL - 78. file:///tmp/html-eJSsR7#FCLANGSETUNION - 79. file:///tmp/html-eJSsR7#FCLANGSETSUBTRACT - 80. file:///tmp/html-eJSsR7#FCLANGSETCOMPARE - 81. file:///tmp/html-eJSsR7#FCLANGSETCONTAINS - 82. file:///tmp/html-eJSsR7#FCLANGSETEQUAL - 83. file:///tmp/html-eJSsR7#FCLANGSETHASH - 84. file:///tmp/html-eJSsR7#FCLANGSETHASLANG - 85. file:///tmp/html-eJSsR7#FCGETDEFAULTLANGS - 86. file:///tmp/html-eJSsR7#FCGETLANGS - 87. file:///tmp/html-eJSsR7#FCLANGNORMALIZE - 88. file:///tmp/html-eJSsR7#FCLANGGETCHARSET - 89. file:///tmp/html-eJSsR7#FCMATRIXINIT - 90. file:///tmp/html-eJSsR7#FCMATRIXCOPY - 91. file:///tmp/html-eJSsR7#FCMATRIXEQUAL - 92. file:///tmp/html-eJSsR7#FCMATRIXMULTIPLY - 93. file:///tmp/html-eJSsR7#FCMATRIXROTATE - 94. file:///tmp/html-eJSsR7#FCMATRIXSCALE - 95. file:///tmp/html-eJSsR7#FCMATRIXSHEAR - 96. file:///tmp/html-eJSsR7#FCCONFIGCREATE - 97. file:///tmp/html-eJSsR7#FCCONFIGREFERENCE - 98. file:///tmp/html-eJSsR7#FCCONFIGDESTROY - 99. file:///tmp/html-eJSsR7#FCCONFIGSETCURRENT - 100. file:///tmp/html-eJSsR7#FCCONFIGGETCURRENT - 101. file:///tmp/html-eJSsR7#FCCONFIGUPTODATE - 102. file:///tmp/html-eJSsR7#FCCONFIGHOME - 103. file:///tmp/html-eJSsR7#FCCONFIGENABLEHOME - 104. file:///tmp/html-eJSsR7#FCCONFIGBUILDFONTS - 105. file:///tmp/html-eJSsR7#FCCONFIGGETCONFIGDIRS - 106. file:///tmp/html-eJSsR7#FCCONFIGGETFONTDIRS - 107. file:///tmp/html-eJSsR7#FCCONFIGGETCONFIGFILES - 108. file:///tmp/html-eJSsR7#FCCONFIGGETCACHE - 109. file:///tmp/html-eJSsR7#FCCONFIGGETCACHEDIRS - 110. file:///tmp/html-eJSsR7#FCCONFIGGETFONTS - 111. file:///tmp/html-eJSsR7#FCCONFIGGETBLANKS - 112. file:///tmp/html-eJSsR7#FCCONFIGGETRESCANINTERVAL - 113. file:///tmp/html-eJSsR7#FCCONFIGSETRESCANINTERVAL - 114. file:///tmp/html-eJSsR7#FCCONFIGAPPFONTADDFILE - 115. file:///tmp/html-eJSsR7#FCCONFIGAPPFONTADDDIR - 116. file:///tmp/html-eJSsR7#FCCONFIGAPPFONTCLEAR - 117. file:///tmp/html-eJSsR7#FCCONFIGSUBSTITUTEWITHPAT - 118. file:///tmp/html-eJSsR7#FCCONFIGSUBSTITUTE - 119. file:///tmp/html-eJSsR7#FCFONTMATCH - 120. file:///tmp/html-eJSsR7#FCFONTSORT - 121. file:///tmp/html-eJSsR7#FCFONTRENDERPREPARE - 122. file:///tmp/html-eJSsR7#FCFONTLIST - 123. file:///tmp/html-eJSsR7#FCCONFIGFILENAME - 124. file:///tmp/html-eJSsR7#FCCONFIGPARSEANDLOAD - 125. file:///tmp/html-eJSsR7#FCCONFIGGETSYSROOT - 126. file:///tmp/html-eJSsR7#FCCONFIGSETSYSROOT - 127. file:///tmp/html-eJSsR7#FCNAMEREGISTEROBJECTTYPES - 128. file:///tmp/html-eJSsR7#FCNAMEUNREGISTEROBJECTTYPES - 129. file:///tmp/html-eJSsR7#FCNAMEGETOBJECTTYPE - 130. file:///tmp/html-eJSsR7#FCNAMEREGISTERCONSTANTS - 131. file:///tmp/html-eJSsR7#FCNAMEUNREGISTERCONSTANTS - 132. file:///tmp/html-eJSsR7#FCNAMEGETCONSTANT - 133. file:///tmp/html-eJSsR7#FCNAMECONSTANT - 134. file:///tmp/html-eJSsR7#FCBLANKSCREATE - 135. file:///tmp/html-eJSsR7#FCBLANKSDESTROY - 136. file:///tmp/html-eJSsR7#FCBLANKSADD - 137. file:///tmp/html-eJSsR7#FCBLANKSISMEMBER - 138. file:///tmp/html-eJSsR7#FCATOMICCREATE - 139. file:///tmp/html-eJSsR7#FCATOMICLOCK - 140. file:///tmp/html-eJSsR7#FCATOMICNEWFILE - 141. file:///tmp/html-eJSsR7#FCATOMICORIGFILE - 142. file:///tmp/html-eJSsR7#FCATOMICREPLACEORIG - 143. file:///tmp/html-eJSsR7#FCATOMICDELETENEW - 144. file:///tmp/html-eJSsR7#FCATOMICUNLOCK - 145. file:///tmp/html-eJSsR7#FCATOMICDESTROY - 146. file:///tmp/html-eJSsR7#FCFILESCAN - 147. file:///tmp/html-eJSsR7#FCFILEISDIR - 148. file:///tmp/html-eJSsR7#FCDIRSCAN - 149. file:///tmp/html-eJSsR7#FCDIRSAVE - 150. file:///tmp/html-eJSsR7#FCDIRCACHEUNLINK - 151. file:///tmp/html-eJSsR7#FCDIRCACHEVALID - 152. file:///tmp/html-eJSsR7#FCDIRCACHELOAD - 153. file:///tmp/html-eJSsR7#FCDIRCACHEREAD - 154. file:///tmp/html-eJSsR7#FCDIRCACHELOADFILE - 155. file:///tmp/html-eJSsR7#FCDIRCACHEUNLOAD - 156. file:///tmp/html-eJSsR7#FCCACHEDIR - 157. file:///tmp/html-eJSsR7#FCCACHECOPYSET - 158. file:///tmp/html-eJSsR7#FCCACHESUBDIR - 159. file:///tmp/html-eJSsR7#FCCACHENUMSUBDIR - 160. file:///tmp/html-eJSsR7#FCCACHENUMFONT - 161. file:///tmp/html-eJSsR7#FCDIRCACHECLEAN - 162. file:///tmp/html-eJSsR7#FCCACHECREATETAGFILE - 163. file:///tmp/html-eJSsR7#FCSTRSETCREATE - 164. file:///tmp/html-eJSsR7#FCSTRSETMEMBER - 165. file:///tmp/html-eJSsR7#FCSTRSETEQUAL - 166. file:///tmp/html-eJSsR7#FCSTRSETADD - 167. file:///tmp/html-eJSsR7#FCSTRSETADDFILENAME - 168. file:///tmp/html-eJSsR7#FCSTRSETDEL - 169. file:///tmp/html-eJSsR7#FCSTRSETDESTROY - 170. file:///tmp/html-eJSsR7#FCSTRLISTCREATE - 171. file:///tmp/html-eJSsR7#FCSTRLISTNEXT - 172. file:///tmp/html-eJSsR7#FCSTRLISTDONE - 173. file:///tmp/html-eJSsR7#FCUTF8TOUCS4 - 174. file:///tmp/html-eJSsR7#FCUCS4TOUTF8 - 175. file:///tmp/html-eJSsR7#FCUTF8LEN - 176. file:///tmp/html-eJSsR7#FCUTF16TOUCS4 - 177. file:///tmp/html-eJSsR7#FCUTF16LEN - 178. file:///tmp/html-eJSsR7#FCISLOWER - 179. file:///tmp/html-eJSsR7#FCISUPPER - 180. file:///tmp/html-eJSsR7#FCTOLOWER - 181. file:///tmp/html-eJSsR7#FCSTRCOPY - 182. file:///tmp/html-eJSsR7#FCSTRDOWNCASE - 183. file:///tmp/html-eJSsR7#FCSTRCOPYFILENAME - 184. file:///tmp/html-eJSsR7#FCSTRCMP - 185. file:///tmp/html-eJSsR7#FCSTRCMPIGNORECASE - 186. file:///tmp/html-eJSsR7#FCSTRSTR - 187. file:///tmp/html-eJSsR7#FCSTRSTRIGNORECASE - 188. file:///tmp/html-eJSsR7#FCSTRPLUS - 189. file:///tmp/html-eJSsR7#FCSTRFREE - 190. file:///tmp/html-eJSsR7#FCSTRDIRNAME - 191. file:///tmp/html-eJSsR7#FCSTRBASENAME + 1. file:///tmp/html-6vSr2R#AEN16 + 2. file:///tmp/html-6vSr2R#AEN19 + 3. file:///tmp/html-6vSr2R#AEN31 + 4. file:///tmp/html-6vSr2R#AEN102 + 5. file:///tmp/html-6vSr2R#FCINITLOADCONFIG + 6. file:///tmp/html-6vSr2R#FCINITLOADCONFIGANDFONTS + 7. file:///tmp/html-6vSr2R#FCINIT + 8. file:///tmp/html-6vSr2R#FCFINI + 9. file:///tmp/html-6vSr2R#FCGETVERSION + 10. file:///tmp/html-6vSr2R#FCINITREINITIALIZE + 11. file:///tmp/html-6vSr2R#FCINITBRINGUPTODATE + 12. file:///tmp/html-6vSr2R#FCPATTERNCREATE + 13. file:///tmp/html-6vSr2R#FCPATTERNDUPLICATE + 14. file:///tmp/html-6vSr2R#FCPATTERNREFERENCE + 15. file:///tmp/html-6vSr2R#FCPATTERNDESTROY + 16. file:///tmp/html-6vSr2R#FCPATTERNEQUAL + 17. file:///tmp/html-6vSr2R#FCPATTERNEQUALSUBSET + 18. file:///tmp/html-6vSr2R#FCPATTERNFILTER + 19. file:///tmp/html-6vSr2R#FCPATTERNHASH + 20. file:///tmp/html-6vSr2R#FCPATTERNADD + 21. file:///tmp/html-6vSr2R#FCPATTERNADDWEAK + 22. file:///tmp/html-6vSr2R#FCPATTERNADD-TYPE + 23. file:///tmp/html-6vSr2R#FCPATTERNGET + 24. file:///tmp/html-6vSr2R#FCPATTERNGET-TYPE + 25. file:///tmp/html-6vSr2R#FCPATTERNBUILD + 26. file:///tmp/html-6vSr2R#FCPATTERNDEL + 27. file:///tmp/html-6vSr2R#FCPATTERNREMOVE + 28. file:///tmp/html-6vSr2R#FCPATTERNPRINT + 29. file:///tmp/html-6vSr2R#FCDEFAULTSUBSTITUTE + 30. file:///tmp/html-6vSr2R#FCNAMEPARSE + 31. file:///tmp/html-6vSr2R#FCNAMEUNPARSE + 32. file:///tmp/html-6vSr2R#FCPATTERNFORMAT + 33. file:///tmp/html-6vSr2R#FCFONTSETCREATE + 34. file:///tmp/html-6vSr2R#FCFONTSETDESTROY + 35. file:///tmp/html-6vSr2R#FCFONTSETADD + 36. file:///tmp/html-6vSr2R#FCFONTSETLIST + 37. file:///tmp/html-6vSr2R#FCFONTSETMATCH + 38. file:///tmp/html-6vSr2R#FCFONTSETPRINT + 39. file:///tmp/html-6vSr2R#FCFONTSETSORT + 40. file:///tmp/html-6vSr2R#FCFONTSETSORTDESTROY + 41. file:///tmp/html-6vSr2R#FCOBJECTSETCREATE + 42. file:///tmp/html-6vSr2R#FCOBJECTSETADD + 43. file:///tmp/html-6vSr2R#FCOBJECTSETDESTROY + 44. file:///tmp/html-6vSr2R#FCOBJECTSETBUILD + 45. file:///tmp/html-6vSr2R#FCFREETYPECHARINDEX + 46. file:///tmp/html-6vSr2R#FCFREETYPECHARSET + 47. file:///tmp/html-6vSr2R#FCFREETYPECHARSETANDSPACING + 48. file:///tmp/html-6vSr2R#FCFREETYPEQUERY + 49. file:///tmp/html-6vSr2R#FCFREETYPEQUERYFACE + 50. file:///tmp/html-6vSr2R#FCVALUEDESTROY + 51. file:///tmp/html-6vSr2R#FCVALUESAVE + 52. file:///tmp/html-6vSr2R#FCVALUEPRINT + 53. file:///tmp/html-6vSr2R#FCVALUEEQUAL + 54. file:///tmp/html-6vSr2R#FCCHARSETCREATE + 55. file:///tmp/html-6vSr2R#FCCHARSETDESTROY + 56. file:///tmp/html-6vSr2R#FCCHARSETADDCHAR + 57. file:///tmp/html-6vSr2R#FCCHARSETDELCHAR + 58. file:///tmp/html-6vSr2R#FCCHARSETCOPY + 59. file:///tmp/html-6vSr2R#FCCHARSETEQUAL + 60. file:///tmp/html-6vSr2R#FCCHARSETINTERSECT + 61. file:///tmp/html-6vSr2R#FCCHARSETUNION + 62. file:///tmp/html-6vSr2R#FCCHARSETSUBTRACT + 63. file:///tmp/html-6vSr2R#FCCHARSETMERGE + 64. file:///tmp/html-6vSr2R#FCCHARSETHASCHAR + 65. file:///tmp/html-6vSr2R#FCCHARSETCOUNT + 66. file:///tmp/html-6vSr2R#FCCHARSETINTERSECTCOUNT + 67. file:///tmp/html-6vSr2R#FCCHARSETSUBTRACTCOUNT + 68. file:///tmp/html-6vSr2R#FCCHARSETISSUBSET + 69. file:///tmp/html-6vSr2R#FCCHARSETFIRSTPAGE + 70. file:///tmp/html-6vSr2R#FCCHARSETNEXTPAGE + 71. file:///tmp/html-6vSr2R#FCCHARSETCOVERAGE + 72. file:///tmp/html-6vSr2R#FCCHARSETNEW + 73. file:///tmp/html-6vSr2R#FCLANGSETCREATE + 74. file:///tmp/html-6vSr2R#FCLANGSETDESTROY + 75. file:///tmp/html-6vSr2R#FCLANGSETCOPY + 76. file:///tmp/html-6vSr2R#FCLANGSETADD + 77. file:///tmp/html-6vSr2R#FCLANGSETDEL + 78. file:///tmp/html-6vSr2R#FCLANGSETUNION + 79. file:///tmp/html-6vSr2R#FCLANGSETSUBTRACT + 80. file:///tmp/html-6vSr2R#FCLANGSETCOMPARE + 81. file:///tmp/html-6vSr2R#FCLANGSETCONTAINS + 82. file:///tmp/html-6vSr2R#FCLANGSETEQUAL + 83. file:///tmp/html-6vSr2R#FCLANGSETHASH + 84. file:///tmp/html-6vSr2R#FCLANGSETHASLANG + 85. file:///tmp/html-6vSr2R#FCGETDEFAULTLANGS + 86. file:///tmp/html-6vSr2R#FCGETLANGS + 87. file:///tmp/html-6vSr2R#FCLANGNORMALIZE + 88. file:///tmp/html-6vSr2R#FCLANGGETCHARSET + 89. file:///tmp/html-6vSr2R#FCMATRIXINIT + 90. file:///tmp/html-6vSr2R#FCMATRIXCOPY + 91. file:///tmp/html-6vSr2R#FCMATRIXEQUAL + 92. file:///tmp/html-6vSr2R#FCMATRIXMULTIPLY + 93. file:///tmp/html-6vSr2R#FCMATRIXROTATE + 94. file:///tmp/html-6vSr2R#FCMATRIXSCALE + 95. file:///tmp/html-6vSr2R#FCMATRIXSHEAR + 96. file:///tmp/html-6vSr2R#FCCONFIGCREATE + 97. file:///tmp/html-6vSr2R#FCCONFIGREFERENCE + 98. file:///tmp/html-6vSr2R#FCCONFIGDESTROY + 99. file:///tmp/html-6vSr2R#FCCONFIGSETCURRENT + 100. file:///tmp/html-6vSr2R#FCCONFIGGETCURRENT + 101. file:///tmp/html-6vSr2R#FCCONFIGUPTODATE + 102. file:///tmp/html-6vSr2R#FCCONFIGHOME + 103. file:///tmp/html-6vSr2R#FCCONFIGENABLEHOME + 104. file:///tmp/html-6vSr2R#FCCONFIGBUILDFONTS + 105. file:///tmp/html-6vSr2R#FCCONFIGGETCONFIGDIRS + 106. file:///tmp/html-6vSr2R#FCCONFIGGETFONTDIRS + 107. file:///tmp/html-6vSr2R#FCCONFIGGETCONFIGFILES + 108. file:///tmp/html-6vSr2R#FCCONFIGGETCACHE + 109. file:///tmp/html-6vSr2R#FCCONFIGGETCACHEDIRS + 110. file:///tmp/html-6vSr2R#FCCONFIGGETFONTS + 111. file:///tmp/html-6vSr2R#FCCONFIGGETBLANKS + 112. file:///tmp/html-6vSr2R#FCCONFIGGETRESCANINTERVAL + 113. file:///tmp/html-6vSr2R#FCCONFIGSETRESCANINTERVAL + 114. file:///tmp/html-6vSr2R#FCCONFIGAPPFONTADDFILE + 115. file:///tmp/html-6vSr2R#FCCONFIGAPPFONTADDDIR + 116. file:///tmp/html-6vSr2R#FCCONFIGAPPFONTCLEAR + 117. file:///tmp/html-6vSr2R#FCCONFIGSUBSTITUTEWITHPAT + 118. file:///tmp/html-6vSr2R#FCCONFIGSUBSTITUTE + 119. file:///tmp/html-6vSr2R#FCFONTMATCH + 120. file:///tmp/html-6vSr2R#FCFONTSORT + 121. file:///tmp/html-6vSr2R#FCFONTRENDERPREPARE + 122. file:///tmp/html-6vSr2R#FCFONTLIST + 123. file:///tmp/html-6vSr2R#FCCONFIGFILENAME + 124. file:///tmp/html-6vSr2R#FCCONFIGPARSEANDLOAD + 125. file:///tmp/html-6vSr2R#FCCONFIGGETSYSROOT + 126. file:///tmp/html-6vSr2R#FCCONFIGSETSYSROOT + 127. file:///tmp/html-6vSr2R#FCNAMEREGISTEROBJECTTYPES + 128. file:///tmp/html-6vSr2R#FCNAMEUNREGISTEROBJECTTYPES + 129. file:///tmp/html-6vSr2R#FCNAMEGETOBJECTTYPE + 130. file:///tmp/html-6vSr2R#FCNAMEREGISTERCONSTANTS + 131. file:///tmp/html-6vSr2R#FCNAMEUNREGISTERCONSTANTS + 132. file:///tmp/html-6vSr2R#FCNAMEGETCONSTANT + 133. file:///tmp/html-6vSr2R#FCNAMECONSTANT + 134. file:///tmp/html-6vSr2R#FCBLANKSCREATE + 135. file:///tmp/html-6vSr2R#FCBLANKSDESTROY + 136. file:///tmp/html-6vSr2R#FCBLANKSADD + 137. file:///tmp/html-6vSr2R#FCBLANKSISMEMBER + 138. file:///tmp/html-6vSr2R#FCATOMICCREATE + 139. file:///tmp/html-6vSr2R#FCATOMICLOCK + 140. file:///tmp/html-6vSr2R#FCATOMICNEWFILE + 141. file:///tmp/html-6vSr2R#FCATOMICORIGFILE + 142. file:///tmp/html-6vSr2R#FCATOMICREPLACEORIG + 143. file:///tmp/html-6vSr2R#FCATOMICDELETENEW + 144. file:///tmp/html-6vSr2R#FCATOMICUNLOCK + 145. file:///tmp/html-6vSr2R#FCATOMICDESTROY + 146. file:///tmp/html-6vSr2R#FCFILESCAN + 147. file:///tmp/html-6vSr2R#FCFILEISDIR + 148. file:///tmp/html-6vSr2R#FCDIRSCAN + 149. file:///tmp/html-6vSr2R#FCDIRSAVE + 150. file:///tmp/html-6vSr2R#FCDIRCACHEUNLINK + 151. file:///tmp/html-6vSr2R#FCDIRCACHEVALID + 152. file:///tmp/html-6vSr2R#FCDIRCACHELOAD + 153. file:///tmp/html-6vSr2R#FCDIRCACHEREAD + 154. file:///tmp/html-6vSr2R#FCDIRCACHELOADFILE + 155. file:///tmp/html-6vSr2R#FCDIRCACHEUNLOAD + 156. file:///tmp/html-6vSr2R#FCCACHEDIR + 157. file:///tmp/html-6vSr2R#FCCACHECOPYSET + 158. file:///tmp/html-6vSr2R#FCCACHESUBDIR + 159. file:///tmp/html-6vSr2R#FCCACHENUMSUBDIR + 160. file:///tmp/html-6vSr2R#FCCACHENUMFONT + 161. file:///tmp/html-6vSr2R#FCDIRCACHECLEAN + 162. file:///tmp/html-6vSr2R#FCCACHECREATETAGFILE + 163. file:///tmp/html-6vSr2R#FCSTRSETCREATE + 164. file:///tmp/html-6vSr2R#FCSTRSETMEMBER + 165. file:///tmp/html-6vSr2R#FCSTRSETEQUAL + 166. file:///tmp/html-6vSr2R#FCSTRSETADD + 167. file:///tmp/html-6vSr2R#FCSTRSETADDFILENAME + 168. file:///tmp/html-6vSr2R#FCSTRSETDEL + 169. file:///tmp/html-6vSr2R#FCSTRSETDESTROY + 170. file:///tmp/html-6vSr2R#FCSTRLISTCREATE + 171. file:///tmp/html-6vSr2R#FCSTRLISTFIRST + 172. file:///tmp/html-6vSr2R#FCSTRLISTNEXT + 173. file:///tmp/html-6vSr2R#FCSTRLISTDONE + 174. file:///tmp/html-6vSr2R#FCUTF8TOUCS4 + 175. file:///tmp/html-6vSr2R#FCUCS4TOUTF8 + 176. file:///tmp/html-6vSr2R#FCUTF8LEN + 177. file:///tmp/html-6vSr2R#FCUTF16TOUCS4 + 178. file:///tmp/html-6vSr2R#FCUTF16LEN + 179. file:///tmp/html-6vSr2R#FCISLOWER + 180. file:///tmp/html-6vSr2R#FCISUPPER + 181. file:///tmp/html-6vSr2R#FCTOLOWER + 182. file:///tmp/html-6vSr2R#FCSTRCOPY + 183. file:///tmp/html-6vSr2R#FCSTRDOWNCASE + 184. file:///tmp/html-6vSr2R#FCSTRCOPYFILENAME + 185. file:///tmp/html-6vSr2R#FCSTRCMP + 186. file:///tmp/html-6vSr2R#FCSTRCMPIGNORECASE + 187. file:///tmp/html-6vSr2R#FCSTRSTR + 188. file:///tmp/html-6vSr2R#FCSTRSTRIGNORECASE + 189. file:///tmp/html-6vSr2R#FCSTRPLUS + 190. file:///tmp/html-6vSr2R#FCSTRFREE + 191. file:///tmp/html-6vSr2R#FCSTRDIRNAME + 192. file:///tmp/html-6vSr2R#FCSTRBASENAME diff -Nru fontconfig-2.10.93/doc/fontconfig-user.html fontconfig-2.11.0/doc/fontconfig-user.html --- fontconfig-2.10.93/doc/fontconfig-user.html 2013-05-20 08:45:07.000000000 +0000 +++ fontconfig-2.11.0/doc/fontconfig-user.html 2013-10-11 04:29:12.000000000 +0000 @@ -157,7 +157,7 @@ file String The filename holding the font index Int The index of the font within the file ftface FT_Face Use the specified FreeType face object - rasterizer String Which rasterizer is in use + rasterizer String Which rasterizer is in use (deprecated) outline Bool Whether the glyphs are outlines scalable Bool Whether glyphs can be scaled scale Double Scale factor for point->pixel conversions @@ -1530,7 +1530,7 @@ >

Version

Fontconfig version 2.10.93 +>Fontconfig version 2.11.0

pixel conversions diff -Nru fontconfig-2.10.93/doc/fontconfig-user.txt fontconfig-2.11.0/doc/fontconfig-user.txt --- fontconfig-2.10.93/doc/fontconfig-user.txt 2013-05-20 08:45:00.000000000 +0000 +++ fontconfig-2.11.0/doc/fontconfig-user.txt 2013-10-11 04:29:06.000000000 +0000 @@ -84,7 +84,7 @@ file String The filename holding the font index Int The index of the font within the file ftface FT_Face Use the specified FreeType face object - rasterizer String Which rasterizer is in use + rasterizer String Which rasterizer is in use (deprecated) outline Bool Whether the glyphs are outlines scalable Bool Whether glyphs can be scaled scale Double Scale factor for point->pixel conversions @@ -774,9 +774,9 @@ Version - Fontconfig version 2.10.93 + Fontconfig version 2.11.0 References Visible links - 1. file:///tmp/html-9Dznk2#DEBUG + 1. file:///tmp/html-hMLhPT#DEBUG diff -Nru fontconfig-2.10.93/doc/fonts-conf.5 fontconfig-2.11.0/doc/fonts-conf.5 --- fontconfig-2.10.93/doc/fonts-conf.5 2013-05-20 08:45:00.000000000 +0000 +++ fontconfig-2.11.0/doc/fonts-conf.5 2013-10-11 04:29:05.000000000 +0000 @@ -1,5 +1,5 @@ .\" auto-generated by docbook2man-spec from docbook-utils package -.TH "FONTS-CONF" "5" "20 5月 2013" "" "" +.TH "FONTS-CONF" "5" "11 10月 2013" "" "" .SH NAME fonts.conf \- Font configuration files .SH SYNOPSIS @@ -81,7 +81,7 @@ file String The filename holding the font index Int The index of the font within the file ftface FT_Face Use the specified FreeType face object - rasterizer String Which rasterizer is in use + rasterizer String Which rasterizer is in use (deprecated) outline Bool Whether the glyphs are outlines scalable Bool Whether glyphs can be scaled scale Double Scale factor for point->pixel conversions @@ -739,4 +739,4 @@ fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1) .SH "VERSION" .PP -Fontconfig version 2.10.93 +Fontconfig version 2.11.0 diff -Nru fontconfig-2.10.93/fc-cache/Makefile.in fontconfig-2.11.0/fc-cache/Makefile.in --- fontconfig-2.10.93/fc-cache/Makefile.in 2013-05-20 08:44:34.000000000 +0000 +++ fontconfig-2.11.0/fc-cache/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-cache$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-cache -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_CACHE_SRC = ${top_srcdir}/fc-cache SGML = ${FC_CACHE_SRC}/fc-cache.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-cache$(EXEEXT): $(fc_cache_OBJECTS) $(fc_cache_DEPENDENCIES) $(EXTRA_fc_cache_DEPENDENCIES) @rm -f fc-cache$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_cache_OBJECTS) $(fc_cache_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -727,9 +747,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-data-local install-dvi \ @@ -739,7 +759,7 @@ install-ps-am 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 \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-local \ uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-cache/fc-cache.c fontconfig-2.11.0/fc-cache/fc-cache.c --- fontconfig-2.10.93/fc-cache/fc-cache.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/fc-cache/fc-cache.c 2013-10-11 03:10:17.000000000 +0000 @@ -118,7 +118,7 @@ static FcStrSet *processed_dirs; static int -scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed) +scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed) { int ret = 0; const FcChar8 *dir; @@ -141,7 +141,7 @@ fflush (stdout); } - if (FcStrSetMember (processed_dirs, dir)) + if (recursive && FcStrSetMember (processed_dirs, dir)) { if (verbose) printf ("skipping, looped directory detected\n"); @@ -213,32 +213,37 @@ ret++; } } - - subdirs = FcStrSetCreate (); - if (!subdirs) + + if (recursive) { - fprintf (stderr, "%s: Can't create subdir set\n", dir); - ret++; - FcDirCacheUnload (cache); - continue; - } - for (i = 0; i < FcCacheNumSubdir (cache); i++) - FcStrSetAdd (subdirs, FcCacheSubdir (cache, i)); + subdirs = FcStrSetCreate (); + if (!subdirs) + { + fprintf (stderr, "%s: Can't create subdir set\n", dir); + ret++; + FcDirCacheUnload (cache); + continue; + } + for (i = 0; i < FcCacheNumSubdir (cache); i++) + FcStrSetAdd (subdirs, FcCacheSubdir (cache, i)); - FcDirCacheUnload (cache); + FcDirCacheUnload (cache); - sublist = FcStrListCreate (subdirs); - FcStrSetDestroy (subdirs); - if (!sublist) - { - fprintf (stderr, "%s: Can't create subdir list\n", dir); - ret++; - continue; + sublist = FcStrListCreate (subdirs); + FcStrSetDestroy (subdirs); + if (!sublist) + { + fprintf (stderr, "%s: Can't create subdir list\n", dir); + ret++; + continue; + } + FcStrSetAdd (processed_dirs, dir); + ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed); + FcStrListDone (sublist); } - FcStrSetAdd (processed_dirs, dir); - ret += scanDirs (sublist, config, force, really_force, verbose, changed); + else + FcDirCacheUnload (cache); } - FcStrListDone (list); return ret; } @@ -366,7 +371,11 @@ } changed = 0; - ret = scanDirs (list, config, force, really_force, verbose, &changed); + ret = scanDirs (list, config, force, really_force, verbose, FcTrue, &changed); + /* Update the directory cache again to avoid the race condition as much as possible */ + FcStrListFirst (list); + ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed); + FcStrListDone (list); /* * Try to create CACHEDIR.TAG anyway. @@ -379,6 +388,8 @@ cleanCacheDirectories (config, verbose); + FcConfigDestroy (config); + FcFini (); /* * Now we need to sleep a second (or two, to be extra sure), to make * sure that timestamps for changes after this run of fc-cache are later @@ -386,8 +397,7 @@ * sleep(3) can't be interrupted by a signal here -- this isn't in the * library, and there aren't any signals flying around here. */ - FcConfigDestroy (config); - FcFini (); + /* the resolution of mtime on FAT is 2 seconds */ if (changed) sleep (2); if (verbose) diff -Nru fontconfig-2.10.93/fc-case/CaseFolding.txt fontconfig-2.11.0/fc-case/CaseFolding.txt --- fontconfig-2.10.93/fc-case/CaseFolding.txt 2012-12-06 10:11:27.000000000 +0000 +++ fontconfig-2.11.0/fc-case/CaseFolding.txt 2013-10-11 04:26:39.000000000 +0000 @@ -1,8 +1,8 @@ -# CaseFolding-6.2.0.txt -# Date: 2012-08-14, 17:54:49 GMT [MD] +# CaseFolding-6.3.0.txt +# Date: 2012-12-20, 22:14:35 GMT [MD] # # Unicode Character Database -# Copyright (c) 1991-2012 Unicode, Inc. +# Copyright (c) 1991-2013 Unicode, Inc. # For terms of use, see http://www.unicode.org/terms_of_use.html # For documentation, see http://www.unicode.org/reports/tr44/ # diff -Nru fontconfig-2.10.93/fc-case/Makefile.in fontconfig-2.11.0/fc-case/Makefile.in --- fontconfig-2.10.93/fc-case/Makefile.in 2013-05-20 08:44:34.000000000 +0000 +++ fontconfig-2.11.0/fc-case/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -65,23 +65,51 @@ # Google Author(s): Behdad Esfahbod VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -100,8 +128,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Tools.mk +DIST_COMMON = $(top_srcdir)/Tools.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(noinst_HEADERS) subdir = fc-case ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -136,6 +164,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -222,6 +267,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -251,7 +298,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -259,7 +305,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -293,11 +338,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ TAG = case DEPS = $(srcdir)/CaseFolding.txt ARGS = $(srcdir)/CaseFolding.txt @@ -366,26 +409,15 @@ clean-libtool: -rm -rf .libs _libs -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -397,15 +429,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -414,9 +442,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -569,17 +598,17 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool cscopelist ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am diff -Nru fontconfig-2.10.93/fc-cat/Makefile.in fontconfig-2.11.0/fc-cat/Makefile.in --- fontconfig-2.10.93/fc-cat/Makefile.in 2013-05-20 08:44:34.000000000 +0000 +++ fontconfig-2.11.0/fc-cat/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-cat$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-cat -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_CAT_SRC = ${top_srcdir}/fc-cat SGML = ${FC_CAT_SRC}/fc-cat.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-cat$(EXEEXT): $(fc_cat_OBJECTS) $(fc_cat_DEPENDENCIES) $(EXTRA_fc_cat_DEPENDENCIES) @rm -f fc-cat$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_cat_OBJECTS) $(fc_cat_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -725,9 +745,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -737,7 +757,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-glyphname/Makefile.in fontconfig-2.11.0/fc-glyphname/Makefile.in --- fontconfig-2.10.93/fc-glyphname/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-glyphname/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -65,23 +65,51 @@ # Google Author(s): Behdad Esfahbod VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -100,8 +128,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Tools.mk +DIST_COMMON = $(top_srcdir)/Tools.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(noinst_HEADERS) subdir = fc-glyphname ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -136,6 +164,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -222,6 +267,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -251,7 +298,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -259,7 +305,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -293,11 +338,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ TAG = glyphname DEPS = $(srcdir)/zapfdingbats.txt ARGS = $(srcdir)/zapfdingbats.txt @@ -366,26 +409,15 @@ clean-libtool: -rm -rf .libs _libs -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -397,15 +429,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -414,9 +442,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -569,17 +598,17 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool cscopelist ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am diff -Nru fontconfig-2.10.93/fc-lang/Makefile.am fontconfig-2.11.0/fc-lang/Makefile.am --- fontconfig-2.10.93/fc-lang/Makefile.am 2013-01-04 01:47:59.000000000 +0000 +++ fontconfig-2.11.0/fc-lang/Makefile.am 2013-10-11 03:10:17.000000000 +0000 @@ -263,6 +263,7 @@ pap_an.orth \ pap_aw.orth \ qu.orth \ + quz.orth \ rn.orth \ rw.orth \ sc.orth \ diff -Nru fontconfig-2.10.93/fc-lang/Makefile.in fontconfig-2.11.0/fc-lang/Makefile.in --- fontconfig-2.10.93/fc-lang/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-lang/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -65,23 +65,51 @@ # Google Author(s): Behdad Esfahbod VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -100,8 +128,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Tools.mk +DIST_COMMON = $(top_srcdir)/Tools.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(noinst_HEADERS) subdir = fc-lang ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -136,6 +164,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -222,6 +267,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -251,7 +298,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -259,7 +305,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -293,11 +338,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ TAG = lang DEPS = $(ORTH) ARGS = -d $(srcdir) $(ORTH) @@ -558,6 +601,7 @@ pap_an.orth \ pap_aw.orth \ qu.orth \ + quz.orth \ rn.orth \ rw.orth \ sc.orth \ @@ -618,26 +662,15 @@ clean-libtool: -rm -rf .libs _libs -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -649,15 +682,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -666,9 +695,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -821,17 +851,17 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool cscopelist ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am diff -Nru fontconfig-2.10.93/fc-lang/fclang.h fontconfig-2.11.0/fc-lang/fclang.h --- fontconfig-2.10.93/fc-lang/fclang.h 2013-01-04 01:48:40.000000000 +0000 +++ fontconfig-2.11.0/fc-lang/fclang.h 2013-10-11 03:35:02.000000000 +0000 @@ -22,9 +22,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* total size: 909 unique leaves: 617 */ +/* total size: 911 unique leaves: 617 */ -#define LEAF0 (243 * sizeof (FcLangCharSet)) +#define LEAF0 (244 * sizeof (FcLangCharSet)) #define OFF0 (LEAF0 + 617 * sizeof (FcCharLeaf)) #define NUM0 (OFF0 + 667 * sizeof (uintptr_t)) #define SET(n) (n * sizeof (FcLangCharSet) + offsetof (FcLangCharSet, charset)) @@ -36,12 +36,12 @@ #define fcLangCharSetIndicesInv (fcLangData.langIndicesInv) static const struct { - FcLangCharSet langCharSets[243]; + FcLangCharSet langCharSets[244]; FcCharLeaf leaves[617]; uintptr_t leaf_offsets[667]; FcChar16 numbers[667]; - FcChar8 langIndices[243]; - FcChar8 langIndicesInv[243]; + FcChar8 langIndices[244]; + FcChar8 langIndicesInv[244]; } fcLangData = { { { "aa", { FC_REF_CONSTANT, 1, OFF(0,0), NUM(0,0) } }, /* 0 */ @@ -212,81 +212,82 @@ { "ps-pk", { FC_REF_CONSTANT, 1, OFF(165,343), NUM(165,343) } }, /* 165 */ { "pt", { FC_REF_CONSTANT, 1, OFF(166,344), NUM(166,344) } }, /* 166 */ { "qu", { FC_REF_CONSTANT, 2, OFF(167,345), NUM(167,345) } }, /* 167 */ - { "rm", { FC_REF_CONSTANT, 1, OFF(168,347), NUM(168,347) } }, /* 168 */ - { "rn", { FC_REF_CONSTANT, 1, OFF(169,87), NUM(169,87) } }, /* 169 */ - { "ro", { FC_REF_CONSTANT, 3, OFF(170,348), NUM(170,348) } }, /* 170 */ - { "ru", { FC_REF_CONSTANT, 1, OFF(171,279), NUM(171,279) } }, /* 171 */ - { "rw", { FC_REF_CONSTANT, 1, OFF(172,87), NUM(172,87) } }, /* 172 */ - { "sa", { FC_REF_CONSTANT, 1, OFF(173,30), NUM(173,30) } }, /* 173 */ - { "sah", { FC_REF_CONSTANT, 1, OFF(174,351), NUM(174,351) } }, /* 174 */ - { "sat", { FC_REF_CONSTANT, 1, OFF(175,352), NUM(175,352) } }, /* 175 */ - { "sc", { FC_REF_CONSTANT, 1, OFF(176,353), NUM(176,353) } }, /* 176 */ - { "sco", { FC_REF_CONSTANT, 3, OFF(177,354), NUM(177,354) } }, /* 177 */ - { "sd", { FC_REF_CONSTANT, 1, OFF(178,357), NUM(178,357) } }, /* 178 */ - { "se", { FC_REF_CONSTANT, 2, OFF(179,358), NUM(179,358) } }, /* 179 */ - { "sel", { FC_REF_CONSTANT, 1, OFF(180,279), NUM(180,279) } }, /* 180 */ - { "sg", { FC_REF_CONSTANT, 1, OFF(181,360), NUM(181,360) } }, /* 181 */ - { "sh", { FC_REF_CONSTANT, 3, OFF(182,361), NUM(182,361) } }, /* 182 */ - { "shs", { FC_REF_CONSTANT, 2, OFF(183,364), NUM(183,364) } }, /* 183 */ - { "si", { FC_REF_CONSTANT, 1, OFF(184,366), NUM(184,366) } }, /* 184 */ - { "sid", { FC_REF_CONSTANT, 2, OFF(185,367), NUM(185,367) } }, /* 185 */ - { "sk", { FC_REF_CONSTANT, 2, OFF(186,369), NUM(186,369) } }, /* 186 */ - { "sl", { FC_REF_CONSTANT, 2, OFF(187,42), NUM(187,42) } }, /* 187 */ - { "sm", { FC_REF_CONSTANT, 2, OFF(188,371), NUM(188,371) } }, /* 188 */ - { "sma", { FC_REF_CONSTANT, 1, OFF(189,373), NUM(189,373) } }, /* 189 */ - { "smj", { FC_REF_CONSTANT, 1, OFF(190,374), NUM(190,374) } }, /* 190 */ - { "smn", { FC_REF_CONSTANT, 2, OFF(191,375), NUM(191,375) } }, /* 191 */ - { "sms", { FC_REF_CONSTANT, 3, OFF(192,377), NUM(192,377) } }, /* 192 */ - { "sn", { FC_REF_CONSTANT, 1, OFF(193,87), NUM(193,87) } }, /* 193 */ - { "so", { FC_REF_CONSTANT, 1, OFF(194,87), NUM(194,87) } }, /* 194 */ - { "sq", { FC_REF_CONSTANT, 1, OFF(195,380), NUM(195,380) } }, /* 195 */ - { "sr", { FC_REF_CONSTANT, 1, OFF(196,381), NUM(196,381) } }, /* 196 */ - { "ss", { FC_REF_CONSTANT, 1, OFF(197,87), NUM(197,87) } }, /* 197 */ - { "st", { FC_REF_CONSTANT, 1, OFF(198,87), NUM(198,87) } }, /* 198 */ - { "su", { FC_REF_CONSTANT, 1, OFF(199,118), NUM(199,118) } }, /* 199 */ - { "sv", { FC_REF_CONSTANT, 1, OFF(200,382), NUM(200,382) } }, /* 200 */ - { "sw", { FC_REF_CONSTANT, 1, OFF(201,87), NUM(201,87) } }, /* 201 */ - { "syr", { FC_REF_CONSTANT, 1, OFF(202,383), NUM(202,383) } }, /* 202 */ - { "ta", { FC_REF_CONSTANT, 1, OFF(203,384), NUM(203,384) } }, /* 203 */ - { "te", { FC_REF_CONSTANT, 1, OFF(204,385), NUM(204,385) } }, /* 204 */ - { "tg", { FC_REF_CONSTANT, 1, OFF(205,386), NUM(205,386) } }, /* 205 */ - { "th", { FC_REF_CONSTANT, 1, OFF(206,387), NUM(206,387) } }, /* 206 */ - { "ti-er", { FC_REF_CONSTANT, 2, OFF(207,45), NUM(207,45) } }, /* 207 */ - { "ti-et", { FC_REF_CONSTANT, 2, OFF(208,367), NUM(208,367) } }, /* 208 */ - { "tig", { FC_REF_CONSTANT, 2, OFF(209,388), NUM(209,388) } }, /* 209 */ - { "tk", { FC_REF_CONSTANT, 2, OFF(210,390), NUM(210,390) } }, /* 210 */ - { "tl", { FC_REF_CONSTANT, 1, OFF(211,86), NUM(211,86) } }, /* 211 */ - { "tn", { FC_REF_CONSTANT, 2, OFF(212,326), NUM(212,326) } }, /* 212 */ - { "to", { FC_REF_CONSTANT, 2, OFF(213,371), NUM(213,371) } }, /* 213 */ - { "tr", { FC_REF_CONSTANT, 2, OFF(214,392), NUM(214,392) } }, /* 214 */ - { "ts", { FC_REF_CONSTANT, 1, OFF(215,87), NUM(215,87) } }, /* 215 */ - { "tt", { FC_REF_CONSTANT, 1, OFF(216,394), NUM(216,394) } }, /* 216 */ - { "tw", { FC_REF_CONSTANT, 5, OFF(217,4), NUM(217,4) } }, /* 217 */ - { "ty", { FC_REF_CONSTANT, 3, OFF(218,395), NUM(218,395) } }, /* 218 */ - { "tyv", { FC_REF_CONSTANT, 1, OFF(219,284), NUM(219,284) } }, /* 219 */ - { "ug", { FC_REF_CONSTANT, 1, OFF(220,398), NUM(220,398) } }, /* 220 */ - { "uk", { FC_REF_CONSTANT, 1, OFF(221,399), NUM(221,399) } }, /* 221 */ - { "ur", { FC_REF_CONSTANT, 1, OFF(222,287), NUM(222,287) } }, /* 222 */ - { "uz", { FC_REF_CONSTANT, 1, OFF(223,87), NUM(223,87) } }, /* 223 */ - { "ve", { FC_REF_CONSTANT, 2, OFF(224,400), NUM(224,400) } }, /* 224 */ - { "vi", { FC_REF_CONSTANT, 4, OFF(225,402), NUM(225,402) } }, /* 225 */ - { "vo", { FC_REF_CONSTANT, 1, OFF(226,406), NUM(226,406) } }, /* 226 */ - { "vot", { FC_REF_CONSTANT, 2, OFF(227,407), NUM(227,407) } }, /* 227 */ - { "wa", { FC_REF_CONSTANT, 1, OFF(228,409), NUM(228,409) } }, /* 228 */ - { "wal", { FC_REF_CONSTANT, 2, OFF(229,367), NUM(229,367) } }, /* 229 */ - { "wen", { FC_REF_CONSTANT, 2, OFF(230,410), NUM(230,410) } }, /* 230 */ - { "wo", { FC_REF_CONSTANT, 2, OFF(231,412), NUM(231,412) } }, /* 231 */ - { "xh", { FC_REF_CONSTANT, 1, OFF(232,87), NUM(232,87) } }, /* 232 */ - { "yap", { FC_REF_CONSTANT, 1, OFF(233,414), NUM(233,414) } }, /* 233 */ - { "yi", { FC_REF_CONSTANT, 1, OFF(234,108), NUM(234,108) } }, /* 234 */ - { "yo", { FC_REF_CONSTANT, 4, OFF(235,415), NUM(235,415) } }, /* 235 */ - { "za", { FC_REF_CONSTANT, 1, OFF(236,87), NUM(236,87) } }, /* 236 */ - { "zh-cn", { FC_REF_CONSTANT, 82, OFF(237,419), NUM(237,419) } }, /* 237 */ - { "zh-hk", { FC_REF_CONSTANT, 83, OFF(238,501), NUM(238,501) } }, /* 238 */ - { "zh-mo", { FC_REF_CONSTANT, 83, OFF(239,501), NUM(239,501) } }, /* 239 */ - { "zh-sg", { FC_REF_CONSTANT, 82, OFF(240,419), NUM(240,419) } }, /* 240 */ - { "zh-tw", { FC_REF_CONSTANT, 83, OFF(241,584), NUM(241,584) } }, /* 241 */ - { "zu", { FC_REF_CONSTANT, 1, OFF(242,87), NUM(242,87) } }, /* 242 */ + { "quz", { FC_REF_CONSTANT, 2, OFF(168,345), NUM(168,345) } }, /* 168 */ + { "rm", { FC_REF_CONSTANT, 1, OFF(169,347), NUM(169,347) } }, /* 169 */ + { "rn", { FC_REF_CONSTANT, 1, OFF(170,87), NUM(170,87) } }, /* 170 */ + { "ro", { FC_REF_CONSTANT, 3, OFF(171,348), NUM(171,348) } }, /* 171 */ + { "ru", { FC_REF_CONSTANT, 1, OFF(172,279), NUM(172,279) } }, /* 172 */ + { "rw", { FC_REF_CONSTANT, 1, OFF(173,87), NUM(173,87) } }, /* 173 */ + { "sa", { FC_REF_CONSTANT, 1, OFF(174,30), NUM(174,30) } }, /* 174 */ + { "sah", { FC_REF_CONSTANT, 1, OFF(175,351), NUM(175,351) } }, /* 175 */ + { "sat", { FC_REF_CONSTANT, 1, OFF(176,352), NUM(176,352) } }, /* 176 */ + { "sc", { FC_REF_CONSTANT, 1, OFF(177,353), NUM(177,353) } }, /* 177 */ + { "sco", { FC_REF_CONSTANT, 3, OFF(178,354), NUM(178,354) } }, /* 178 */ + { "sd", { FC_REF_CONSTANT, 1, OFF(179,357), NUM(179,357) } }, /* 179 */ + { "se", { FC_REF_CONSTANT, 2, OFF(180,358), NUM(180,358) } }, /* 180 */ + { "sel", { FC_REF_CONSTANT, 1, OFF(181,279), NUM(181,279) } }, /* 181 */ + { "sg", { FC_REF_CONSTANT, 1, OFF(182,360), NUM(182,360) } }, /* 182 */ + { "sh", { FC_REF_CONSTANT, 3, OFF(183,361), NUM(183,361) } }, /* 183 */ + { "shs", { FC_REF_CONSTANT, 2, OFF(184,364), NUM(184,364) } }, /* 184 */ + { "si", { FC_REF_CONSTANT, 1, OFF(185,366), NUM(185,366) } }, /* 185 */ + { "sid", { FC_REF_CONSTANT, 2, OFF(186,367), NUM(186,367) } }, /* 186 */ + { "sk", { FC_REF_CONSTANT, 2, OFF(187,369), NUM(187,369) } }, /* 187 */ + { "sl", { FC_REF_CONSTANT, 2, OFF(188,42), NUM(188,42) } }, /* 188 */ + { "sm", { FC_REF_CONSTANT, 2, OFF(189,371), NUM(189,371) } }, /* 189 */ + { "sma", { FC_REF_CONSTANT, 1, OFF(190,373), NUM(190,373) } }, /* 190 */ + { "smj", { FC_REF_CONSTANT, 1, OFF(191,374), NUM(191,374) } }, /* 191 */ + { "smn", { FC_REF_CONSTANT, 2, OFF(192,375), NUM(192,375) } }, /* 192 */ + { "sms", { FC_REF_CONSTANT, 3, OFF(193,377), NUM(193,377) } }, /* 193 */ + { "sn", { FC_REF_CONSTANT, 1, OFF(194,87), NUM(194,87) } }, /* 194 */ + { "so", { FC_REF_CONSTANT, 1, OFF(195,87), NUM(195,87) } }, /* 195 */ + { "sq", { FC_REF_CONSTANT, 1, OFF(196,380), NUM(196,380) } }, /* 196 */ + { "sr", { FC_REF_CONSTANT, 1, OFF(197,381), NUM(197,381) } }, /* 197 */ + { "ss", { FC_REF_CONSTANT, 1, OFF(198,87), NUM(198,87) } }, /* 198 */ + { "st", { FC_REF_CONSTANT, 1, OFF(199,87), NUM(199,87) } }, /* 199 */ + { "su", { FC_REF_CONSTANT, 1, OFF(200,118), NUM(200,118) } }, /* 200 */ + { "sv", { FC_REF_CONSTANT, 1, OFF(201,382), NUM(201,382) } }, /* 201 */ + { "sw", { FC_REF_CONSTANT, 1, OFF(202,87), NUM(202,87) } }, /* 202 */ + { "syr", { FC_REF_CONSTANT, 1, OFF(203,383), NUM(203,383) } }, /* 203 */ + { "ta", { FC_REF_CONSTANT, 1, OFF(204,384), NUM(204,384) } }, /* 204 */ + { "te", { FC_REF_CONSTANT, 1, OFF(205,385), NUM(205,385) } }, /* 205 */ + { "tg", { FC_REF_CONSTANT, 1, OFF(206,386), NUM(206,386) } }, /* 206 */ + { "th", { FC_REF_CONSTANT, 1, OFF(207,387), NUM(207,387) } }, /* 207 */ + { "ti-er", { FC_REF_CONSTANT, 2, OFF(208,45), NUM(208,45) } }, /* 208 */ + { "ti-et", { FC_REF_CONSTANT, 2, OFF(209,367), NUM(209,367) } }, /* 209 */ + { "tig", { FC_REF_CONSTANT, 2, OFF(210,388), NUM(210,388) } }, /* 210 */ + { "tk", { FC_REF_CONSTANT, 2, OFF(211,390), NUM(211,390) } }, /* 211 */ + { "tl", { FC_REF_CONSTANT, 1, OFF(212,86), NUM(212,86) } }, /* 212 */ + { "tn", { FC_REF_CONSTANT, 2, OFF(213,326), NUM(213,326) } }, /* 213 */ + { "to", { FC_REF_CONSTANT, 2, OFF(214,371), NUM(214,371) } }, /* 214 */ + { "tr", { FC_REF_CONSTANT, 2, OFF(215,392), NUM(215,392) } }, /* 215 */ + { "ts", { FC_REF_CONSTANT, 1, OFF(216,87), NUM(216,87) } }, /* 216 */ + { "tt", { FC_REF_CONSTANT, 1, OFF(217,394), NUM(217,394) } }, /* 217 */ + { "tw", { FC_REF_CONSTANT, 5, OFF(218,4), NUM(218,4) } }, /* 218 */ + { "ty", { FC_REF_CONSTANT, 3, OFF(219,395), NUM(219,395) } }, /* 219 */ + { "tyv", { FC_REF_CONSTANT, 1, OFF(220,284), NUM(220,284) } }, /* 220 */ + { "ug", { FC_REF_CONSTANT, 1, OFF(221,398), NUM(221,398) } }, /* 221 */ + { "uk", { FC_REF_CONSTANT, 1, OFF(222,399), NUM(222,399) } }, /* 222 */ + { "ur", { FC_REF_CONSTANT, 1, OFF(223,287), NUM(223,287) } }, /* 223 */ + { "uz", { FC_REF_CONSTANT, 1, OFF(224,87), NUM(224,87) } }, /* 224 */ + { "ve", { FC_REF_CONSTANT, 2, OFF(225,400), NUM(225,400) } }, /* 225 */ + { "vi", { FC_REF_CONSTANT, 4, OFF(226,402), NUM(226,402) } }, /* 226 */ + { "vo", { FC_REF_CONSTANT, 1, OFF(227,406), NUM(227,406) } }, /* 227 */ + { "vot", { FC_REF_CONSTANT, 2, OFF(228,407), NUM(228,407) } }, /* 228 */ + { "wa", { FC_REF_CONSTANT, 1, OFF(229,409), NUM(229,409) } }, /* 229 */ + { "wal", { FC_REF_CONSTANT, 2, OFF(230,367), NUM(230,367) } }, /* 230 */ + { "wen", { FC_REF_CONSTANT, 2, OFF(231,410), NUM(231,410) } }, /* 231 */ + { "wo", { FC_REF_CONSTANT, 2, OFF(232,412), NUM(232,412) } }, /* 232 */ + { "xh", { FC_REF_CONSTANT, 1, OFF(233,87), NUM(233,87) } }, /* 233 */ + { "yap", { FC_REF_CONSTANT, 1, OFF(234,414), NUM(234,414) } }, /* 234 */ + { "yi", { FC_REF_CONSTANT, 1, OFF(235,108), NUM(235,108) } }, /* 235 */ + { "yo", { FC_REF_CONSTANT, 4, OFF(236,415), NUM(236,415) } }, /* 236 */ + { "za", { FC_REF_CONSTANT, 1, OFF(237,87), NUM(237,87) } }, /* 237 */ + { "zh-cn", { FC_REF_CONSTANT, 82, OFF(238,419), NUM(238,419) } }, /* 238 */ + { "zh-hk", { FC_REF_CONSTANT, 83, OFF(239,501), NUM(239,501) } }, /* 239 */ + { "zh-mo", { FC_REF_CONSTANT, 83, OFF(240,501), NUM(240,501) } }, /* 240 */ + { "zh-sg", { FC_REF_CONSTANT, 82, OFF(241,419), NUM(241,419) } }, /* 241 */ + { "zh-tw", { FC_REF_CONSTANT, 83, OFF(242,584), NUM(242,584) } }, /* 242 */ + { "zu", { FC_REF_CONSTANT, 1, OFF(243,87), NUM(243,87) } }, /* 243 */ }, { { { /* 0 */ @@ -3659,7 +3660,7 @@ 19, /* bn */ 20, /* bo */ 21, /* br */ - 239, /* brx */ + 240, /* brx */ 22, /* bs */ 23, /* bua */ 194, /* byn */ @@ -3677,7 +3678,7 @@ 33, /* cy */ 34, /* da */ 35, /* de */ - 241, /* doi */ + 242, /* doi */ 197, /* dv */ 36, /* dz */ 198, /* ee */ @@ -3751,7 +3752,7 @@ 212, /* kwm */ 91, /* ky */ 92, /* la */ - 237, /* lah */ + 238, /* lah */ 93, /* lb */ 94, /* lez */ 213, /* lg */ @@ -3768,7 +3769,7 @@ 103, /* ml */ 104, /* mn_cn */ 216, /* mn_mn */ - 242, /* mni */ + 243, /* mni */ 105, /* mo */ 106, /* mr */ 217, /* ms */ @@ -3782,7 +3783,7 @@ 112, /* nl */ 113, /* nn */ 114, /* no */ - 238, /* nqo */ + 239, /* nqo */ 115, /* nr */ 116, /* nso */ 220, /* nv */ @@ -3801,24 +3802,25 @@ 125, /* ps_pk */ 126, /* pt */ 225, /* qu */ + 226, /* quz */ 127, /* rm */ - 226, /* rn */ + 227, /* rn */ 128, /* ro */ 129, /* ru */ - 227, /* rw */ + 228, /* rw */ 130, /* sa */ 131, /* sah */ - 240, /* sat */ - 228, /* sc */ + 241, /* sat */ + 229, /* sc */ 132, /* sco */ - 229, /* sd */ + 230, /* sd */ 133, /* se */ 134, /* sel */ - 230, /* sg */ + 231, /* sg */ 135, /* sh */ 136, /* shs */ 137, /* si */ - 231, /* sid */ + 232, /* sid */ 138, /* sk */ 139, /* sl */ 140, /* sm */ @@ -3826,13 +3828,13 @@ 142, /* smj */ 143, /* smn */ 144, /* sms */ - 232, /* sn */ + 233, /* sn */ 145, /* so */ 146, /* sq */ 147, /* sr */ 148, /* ss */ 149, /* st */ - 233, /* su */ + 234, /* su */ 150, /* sv */ 151, /* sw */ 152, /* syr */ @@ -3851,7 +3853,7 @@ 165, /* ts */ 166, /* tt */ 167, /* tw */ - 234, /* ty */ + 235, /* ty */ 168, /* tyv */ 169, /* ug */ 170, /* uk */ @@ -3862,14 +3864,14 @@ 175, /* vo */ 176, /* vot */ 177, /* wa */ - 235, /* wal */ + 236, /* wal */ 178, /* wen */ 179, /* wo */ 180, /* xh */ 181, /* yap */ 182, /* yi */ 183, /* yo */ - 236, /* za */ + 237, /* za */ 184, /* zh_cn */ 185, /* zh_hk */ 186, /* zh_mo */ @@ -4005,69 +4007,69 @@ 164, /* ps_af */ 165, /* ps_pk */ 166, /* pt */ - 168, /* rm */ - 170, /* ro */ - 171, /* ru */ - 173, /* sa */ - 174, /* sah */ - 177, /* sco */ - 179, /* se */ - 180, /* sel */ - 182, /* sh */ - 183, /* shs */ - 184, /* si */ - 186, /* sk */ - 187, /* sl */ - 188, /* sm */ - 189, /* sma */ - 190, /* smj */ - 191, /* smn */ - 192, /* sms */ - 194, /* so */ - 195, /* sq */ - 196, /* sr */ - 197, /* ss */ - 198, /* st */ - 200, /* sv */ - 201, /* sw */ - 202, /* syr */ - 203, /* ta */ - 204, /* te */ - 205, /* tg */ - 206, /* th */ - 207, /* ti_er */ - 208, /* ti_et */ - 209, /* tig */ - 210, /* tk */ - 211, /* tl */ - 212, /* tn */ - 213, /* to */ - 214, /* tr */ - 215, /* ts */ - 216, /* tt */ - 217, /* tw */ - 219, /* tyv */ - 220, /* ug */ - 221, /* uk */ - 222, /* ur */ - 223, /* uz */ - 224, /* ve */ - 225, /* vi */ - 226, /* vo */ - 227, /* vot */ - 228, /* wa */ - 230, /* wen */ - 231, /* wo */ - 232, /* xh */ - 233, /* yap */ - 234, /* yi */ - 235, /* yo */ - 237, /* zh_cn */ - 238, /* zh_hk */ - 239, /* zh_mo */ - 240, /* zh_sg */ - 241, /* zh_tw */ - 242, /* zu */ + 169, /* rm */ + 171, /* ro */ + 172, /* ru */ + 174, /* sa */ + 175, /* sah */ + 178, /* sco */ + 180, /* se */ + 181, /* sel */ + 183, /* sh */ + 184, /* shs */ + 185, /* si */ + 187, /* sk */ + 188, /* sl */ + 189, /* sm */ + 190, /* sma */ + 191, /* smj */ + 192, /* smn */ + 193, /* sms */ + 195, /* so */ + 196, /* sq */ + 197, /* sr */ + 198, /* ss */ + 199, /* st */ + 201, /* sv */ + 202, /* sw */ + 203, /* syr */ + 204, /* ta */ + 205, /* te */ + 206, /* tg */ + 207, /* th */ + 208, /* ti_er */ + 209, /* ti_et */ + 210, /* tig */ + 211, /* tk */ + 212, /* tl */ + 213, /* tn */ + 214, /* to */ + 215, /* tr */ + 216, /* ts */ + 217, /* tt */ + 218, /* tw */ + 220, /* tyv */ + 221, /* ug */ + 222, /* uk */ + 223, /* ur */ + 224, /* uz */ + 225, /* ve */ + 226, /* vi */ + 227, /* vo */ + 228, /* vot */ + 229, /* wa */ + 231, /* wen */ + 232, /* wo */ + 233, /* xh */ + 234, /* yap */ + 235, /* yi */ + 236, /* yo */ + 238, /* zh_cn */ + 239, /* zh_hk */ + 240, /* zh_mo */ + 241, /* zh_sg */ + 242, /* zh_tw */ + 243, /* zu */ 3, /* ak */ 5, /* an */ 15, /* ber_dz */ @@ -4104,27 +4106,28 @@ 161, /* pap_an */ 162, /* pap_aw */ 167, /* qu */ - 169, /* rn */ - 172, /* rw */ - 176, /* sc */ - 178, /* sd */ - 181, /* sg */ - 185, /* sid */ - 193, /* sn */ - 199, /* su */ - 218, /* ty */ - 229, /* wal */ - 236, /* za */ + 168, /* quz */ + 170, /* rn */ + 173, /* rw */ + 177, /* sc */ + 179, /* sd */ + 182, /* sg */ + 186, /* sid */ + 194, /* sn */ + 200, /* su */ + 219, /* ty */ + 230, /* wal */ + 237, /* za */ 118, /* lah */ 149, /* nqo */ 26, /* brx */ - 175, /* sat */ + 176, /* sat */ 44, /* doi */ 135, /* mni */ } }; -#define NUM_LANG_CHAR_SET 243 +#define NUM_LANG_CHAR_SET 244 #define NUM_LANG_SET_MAP 8 static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = { @@ -4159,15 +4162,15 @@ { 141, 153 }, /* n */ { 154, 158 }, /* o */ { 159, 166 }, /* p */ - { 167, 167 }, /* q */ - { 168, 172 }, /* r */ - { 173, 202 }, /* s */ - { 203, 219 }, /* t */ - { 220, 223 }, /* u */ - { 224, 227 }, /* v */ - { 228, 231 }, /* w */ - { 232, 232 }, /* x */ - { 233, 235 }, /* y */ - { 236, 242 }, /* z */ + { 167, 168 }, /* q */ + { 169, 173 }, /* r */ + { 174, 203 }, /* s */ + { 204, 220 }, /* t */ + { 221, 224 }, /* u */ + { 225, 228 }, /* v */ + { 229, 232 }, /* w */ + { 233, 233 }, /* x */ + { 234, 236 }, /* y */ + { 237, 243 }, /* z */ }; diff -Nru fontconfig-2.10.93/fc-lang/quz.orth fontconfig-2.11.0/fc-lang/quz.orth --- fontconfig-2.10.93/fc-lang/quz.orth 1970-01-01 00:00:00.000000000 +0000 +++ fontconfig-2.11.0/fc-lang/quz.orth 2013-10-11 03:10:17.000000000 +0000 @@ -0,0 +1,36 @@ +# +# fontconfig/fc-lang/quz.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# 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 the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) 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. +# +# Cusco Quechua (quz) +# +# Sources: +# * http://en.wikipedia.org/wiki/Quechua_alphabet +# * http://www.omniglot.com/writing/quechua.htm +# +# Some basic Latin letters are not used, based on dialect +# +0041-005A +0061-007A +00D1 +00F1 +02C8 diff -Nru fontconfig-2.10.93/fc-list/Makefile.in fontconfig-2.11.0/fc-list/Makefile.in --- fontconfig-2.10.93/fc-list/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-list/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-list$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-list -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_LIST_SRC = ${top_srcdir}/fc-list SGML = ${FC_LIST_SRC}/fc-list.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-list$(EXEEXT): $(fc_list_OBJECTS) $(fc_list_DEPENDENCIES) $(EXTRA_fc_list_DEPENDENCIES) @rm -f fc-list$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_list_OBJECTS) $(fc_list_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -725,9 +745,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -737,7 +757,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-list/fc-list.1 fontconfig-2.11.0/fc-list/fc-list.1 --- fontconfig-2.10.93/fc-list/fc-list.1 2013-03-21 07:32:10.000000000 +0000 +++ fontconfig-2.11.0/fc-list/fc-list.1 2013-10-11 03:39:43.000000000 +0000 @@ -4,7 +4,7 @@ fc-list \- list available fonts .SH SYNOPSIS .sp -\fBfc-list\fR [ \fB-vVh\fR ] [ \fB--verbose\fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] +\fBfc-list\fR [ \fB-vVh\fR ] [ \fB--verbose\fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB [ -q ] [ --quiet ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIpattern\fB [ \fIelement\fB\fI...\fB ] \fR ] .SH "DESCRIPTION" @@ -29,6 +29,9 @@ Format output according to the format specifier \fIformat\fR\&. .TP +\fB-q\fR +Suppress all normal output. returns 1 as the error code if no fonts matched. +.TP \fB-V\fR Show version of the program and exit. .TP diff -Nru fontconfig-2.10.93/fc-list/fc-list.c fontconfig-2.11.0/fc-list/fc-list.c --- fontconfig-2.10.93/fc-list/fc-list.c 2013-01-07 08:54:05.000000000 +0000 +++ fontconfig-2.11.0/fc-list/fc-list.c 2013-10-11 03:10:17.000000000 +0000 @@ -139,6 +139,11 @@ if (argv[i]) { pat = FcNameParse ((FcChar8 *) argv[i]); + if (!pat) + { + fputs ("Unable to parse the pattern\n", stderr); + return 1; + } while (argv[++i]) { if (!os) diff -Nru fontconfig-2.10.93/fc-list/fc-list.sgml fontconfig-2.11.0/fc-list/fc-list.sgml --- fontconfig-2.10.93/fc-list/fc-list.sgml 2012-06-01 02:26:10.000000000 +0000 +++ fontconfig-2.11.0/fc-list/fc-list.sgml 2013-10-11 03:10:17.000000000 +0000 @@ -69,6 +69,10 @@ + + + + @@ -114,6 +118,14 @@ + + + + + Suppress all normal output. returns 1 as the error code if no fonts matched. + + + diff -Nru fontconfig-2.10.93/fc-match/Makefile.in fontconfig-2.11.0/fc-match/Makefile.in --- fontconfig-2.10.93/fc-match/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-match/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-match$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-match -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_MATCH_SRC = ${top_srcdir}/fc-match SGML = ${FC_MATCH_SRC}/fc-match.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-match$(EXEEXT): $(fc_match_OBJECTS) $(fc_match_DEPENDENCIES) $(EXTRA_fc_match_DEPENDENCIES) @rm -f fc-match$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_match_OBJECTS) $(fc_match_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -725,9 +745,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -737,7 +757,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-match/fc-match.c fontconfig-2.11.0/fc-match/fc-match.c --- fontconfig-2.10.93/fc-match/fc-match.c 2013-01-07 08:54:05.000000000 +0000 +++ fontconfig-2.11.0/fc-match/fc-match.c 2013-10-11 03:10:17.000000000 +0000 @@ -146,6 +146,11 @@ if (argv[i]) { pat = FcNameParse ((FcChar8 *) argv[i]); + if (!pat) + { + fputs ("Unable to parse the pattern\n", stderr); + return 1; + } while (argv[++i]) { if (!os) diff -Nru fontconfig-2.10.93/fc-pattern/Makefile.in fontconfig-2.11.0/fc-pattern/Makefile.in --- fontconfig-2.10.93/fc-pattern/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-pattern/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-pattern$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-pattern -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_PATTERN_SRC = ${top_srcdir}/fc-pattern SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-pattern$(EXEEXT): $(fc_pattern_OBJECTS) $(fc_pattern_DEPENDENCIES) $(EXTRA_fc_pattern_DEPENDENCIES) @rm -f fc-pattern$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_pattern_OBJECTS) $(fc_pattern_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -725,9 +745,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -737,7 +757,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-pattern/fc-pattern.c fontconfig-2.11.0/fc-pattern/fc-pattern.c --- fontconfig-2.10.93/fc-pattern/fc-pattern.c 2013-01-07 08:54:05.000000000 +0000 +++ fontconfig-2.11.0/fc-pattern/fc-pattern.c 2013-10-11 03:10:17.000000000 +0000 @@ -137,6 +137,11 @@ if (argv[i]) { pat = FcNameParse ((FcChar8 *) argv[i]); + if (!pat) + { + fputs ("Unable to parse the pattern\n", stderr); + return 1; + } while (argv[++i]) { if (!os) diff -Nru fontconfig-2.10.93/fc-query/Makefile.in fontconfig-2.11.0/fc-query/Makefile.in --- fontconfig-2.10.93/fc-query/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-query/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-query$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-query -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_QUERY_SRC = ${top_srcdir}/fc-query SGML = ${FC_QUERY_SRC}/fc-query.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-query$(EXEEXT): $(fc_query_OBJECTS) $(fc_query_DEPENDENCIES) $(EXTRA_fc_query_DEPENDENCIES) @rm -f fc-query$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_query_OBJECTS) $(fc_query_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -725,9 +745,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -737,7 +757,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-scan/Makefile.in fontconfig-2.11.0/fc-scan/Makefile.in --- fontconfig-2.10.93/fc-scan/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-scan/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-scan$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = ${man_MANS} subdir = fc-scan -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -171,6 +199,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,6 +302,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -286,7 +333,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -294,7 +340,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -328,11 +373,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_SCAN_SRC = ${top_srcdir}/fc-scan SGML = ${FC_SCAN_SRC}/fc-scan.sgml @@ -385,10 +428,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -409,7 +454,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -422,6 +468,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-scan$(EXEEXT): $(fc_scan_OBJECTS) $(fc_scan_DEPENDENCIES) $(EXTRA_fc_scan_DEPENDENCIES) @rm -f fc-scan$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_scan_OBJECTS) $(fc_scan_LDADD) $(LIBS) @@ -504,26 +551,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +571,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +584,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -571,19 +604,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -725,9 +745,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -737,7 +757,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fc-validate/Makefile.in fontconfig-2.11.0/fc-validate/Makefile.in --- fontconfig-2.10.93/fc-validate/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fc-validate/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -38,23 +38,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,7 +104,7 @@ bin_PROGRAMS = fc-validate$(EXEEXT) @USEDOCBOOK_TRUE@am__append_1 = $(man_MANS) subdir = fc-validate -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -173,6 +201,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -259,6 +304,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -288,7 +335,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -296,7 +342,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -330,11 +375,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ DOC2MAN = docbook2man FC_VALIDATE_SRC = ${top_srcdir}/fc-validate SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml @@ -387,10 +430,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -411,7 +456,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -424,6 +470,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fc-validate$(EXEEXT): $(fc_validate_OBJECTS) $(fc_validate_DEPENDENCIES) $(EXTRA_fc_validate_DEPENDENCIES) @rm -f fc-validate$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fc_validate_OBJECTS) $(fc_validate_LDADD) $(LIBS) @@ -506,26 +553,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -537,15 +573,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -554,9 +586,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -573,19 +606,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -727,9 +747,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ @@ -739,7 +759,7 @@ 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 \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 diff -Nru fontconfig-2.10.93/fontconfig/Makefile.in fontconfig-2.11.0/fontconfig/Makefile.in --- fontconfig-2.10.93/fontconfig/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/fontconfig/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = fontconfig -DIST_COMMON = $(fontconfiginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(fontconfiginclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ @@ -114,6 +142,23 @@ } am__installdirs = "$(DESTDIR)$(fontconfigincludedir)" HEADERS = $(fontconfiginclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -200,6 +245,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -229,7 +276,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -237,7 +283,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -271,11 +316,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ fontconfigincludedir = $(includedir)/fontconfig fontconfig_headers = \ fontconfig.h \ @@ -344,26 +387,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(fontconfigincludedir)'; $(am__uninstall_files_from_dir) -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -375,15 +407,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -392,9 +420,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -545,18 +574,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool cscopelist ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-fontconfigincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-fontconfigincludeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-fontconfigincludeHEADERS \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-fontconfigincludeHEADERS -include $(top_srcdir)/git.mk diff -Nru fontconfig-2.10.93/fontconfig/fcprivate.h fontconfig-2.11.0/fontconfig/fcprivate.h --- fontconfig-2.10.93/fontconfig/fcprivate.h 2012-06-01 02:26:10.000000000 +0000 +++ fontconfig-2.11.0/fontconfig/fcprivate.h 2013-10-11 03:10:17.000000000 +0000 @@ -48,8 +48,9 @@ __o__ = va_arg (va, const char *); \ if (!__o__) \ break; \ - __v__.type = va_arg (va, FcType); \ + __v__.type = va_arg (va, int); \ switch (__v__.type) { \ + case FcTypeUnknown: \ case FcTypeVoid: \ goto _FcPatternVapBuild_bail1; \ case FcTypeInteger: \ diff -Nru fontconfig-2.10.93/fontconfig/fontconfig.h fontconfig-2.11.0/fontconfig/fontconfig.h --- fontconfig-2.10.93/fontconfig/fontconfig.h 2013-05-20 08:42:34.000000000 +0000 +++ fontconfig-2.11.0/fontconfig/fontconfig.h 2013-10-11 04:27:42.000000000 +0000 @@ -51,8 +51,8 @@ */ #define FC_MAJOR 2 -#define FC_MINOR 10 -#define FC_REVISION 93 +#define FC_MINOR 11 +#define FC_REVISION 0 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) @@ -91,7 +91,7 @@ #define FC_FILE "file" /* String */ #define FC_INDEX "index" /* Int */ #define FC_FT_FACE "ftface" /* FT_Face */ -#define FC_RASTERIZER "rasterizer" /* String */ +#define FC_RASTERIZER "rasterizer" /* String (deprecated) */ #define FC_OUTLINE "outline" /* Bool */ #define FC_SCALABLE "scalable" /* Bool */ #define FC_SCALE "scale" /* double */ @@ -185,6 +185,7 @@ #define FC_LCD_LEGACY 3 typedef enum _FcType { + FcTypeUnknown = -1, FcTypeVoid, FcTypeInteger, FcTypeDouble, @@ -973,6 +974,9 @@ FcPublic FcStrList * FcStrListCreate (FcStrSet *set); +FcPublic void +FcStrListFirst (FcStrList *list); + FcPublic FcChar8 * FcStrListNext (FcStrList *list); diff -Nru fontconfig-2.10.93/fontconfig.pc.in fontconfig-2.11.0/fontconfig.pc.in --- fontconfig-2.10.93/fontconfig.pc.in 2012-07-24 02:01:32.000000000 +0000 +++ fontconfig-2.11.0/fontconfig.pc.in 2013-10-11 03:10:17.000000000 +0000 @@ -11,6 +11,8 @@ Name: Fontconfig Description: Font configuration and customization library Version: @VERSION@ +Requires: @PKGCONFIG_REQUIRES@ +Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ Libs: -L${libdir} -lfontconfig -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ -Cflags: -I${includedir} +Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ +Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ diff -Nru fontconfig-2.10.93/fontconfig.spec fontconfig-2.11.0/fontconfig.spec --- fontconfig-2.10.93/fontconfig.spec 2013-05-20 08:44:43.000000000 +0000 +++ fontconfig-2.11.0/fontconfig.spec 2013-10-11 04:28:52.000000000 +0000 @@ -4,7 +4,7 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.10.93 +Version: 2.11.0 Release: 1 License: MIT Group: System Environment/Libraries diff -Nru fontconfig-2.10.93/missing fontconfig-2.11.0/missing --- fontconfig-2.10.93/missing 2012-09-26 14:03:18.000000000 +0000 +++ fontconfig-2.11.0/missing 2013-06-17 09:16:35.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru fontconfig-2.10.93/src/Makefile.in fontconfig-2.11.0/src/Makefile.in --- fontconfig-2.10.93/src/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/src/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -41,23 +41,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -78,8 +106,8 @@ host_triplet = @host@ noinst_PROGRAMS = fcarch$(EXEEXT) subdir = src -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ @@ -184,6 +212,23 @@ esac DATA = $(noinst_DATA) HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -270,6 +315,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -299,7 +346,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -307,7 +353,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -341,11 +386,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ EXTRA_DIST = makealias fcobjshash.gperf.h fcobjshash.gperf \ fcobjshash.h @OS_WIN32_TRUE@export_symbols = -export-symbols fontconfig.def @@ -461,6 +504,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -495,6 +539,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libfontconfig.la: $(libfontconfig_la_OBJECTS) $(libfontconfig_la_DEPENDENCIES) $(EXTRA_libfontconfig_la_DEPENDENCIES) $(AM_V_CCLD)$(libfontconfig_la_LINK) -rpath $(libdir) $(libfontconfig_la_OBJECTS) $(libfontconfig_la_LIBADD) $(LIBS) @@ -506,6 +551,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fcarch$(EXEEXT): $(fcarch_OBJECTS) $(fcarch_DEPENDENCIES) $(EXTRA_fcarch_DEPENDENCIES) @rm -f fcarch$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fcarch_OBJECTS) $(fcarch_LDADD) $(LIBS) @@ -571,26 +617,15 @@ clean-libtool: -rm -rf .libs _libs -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +637,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,9 +650,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -784,20 +816,21 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am 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-libLTLIBRARIES uninstall-local + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am 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 tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-local # gcc import library install/uninstall diff -Nru fontconfig-2.10.93/src/fcarch.c fontconfig-2.11.0/src/fcarch.c --- fontconfig-2.10.93/src/fcarch.c 2013-01-04 01:47:59.000000000 +0000 +++ fontconfig-2.11.0/src/fcarch.c 2013-10-11 03:10:17.000000000 +0000 @@ -23,10 +23,6 @@ #include -#ifdef HAVE_CONFIG_H -#include -#endif - #include "fcint.h" #include "fcarch.h" @@ -49,7 +45,7 @@ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **)); FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *)); -FC_ASSERT_STATIC (0x08 + 1*FC_MAX(4,ALIGNOF_DOUBLE) == sizeof (FcValue)); +FC_ASSERT_STATIC (0x08 + 1*FC_MAX(SIZEOF_VOID_P,ALIGNOF_DOUBLE) == sizeof (FcValue)); FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt)); FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern)); FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet)); diff -Nru fontconfig-2.10.93/src/fcarch.h fontconfig-2.11.0/src/fcarch.h --- fontconfig-2.10.93/src/fcarch.h 2012-07-24 02:01:32.000000000 +0000 +++ fontconfig-2.11.0/src/fcarch.h 2013-10-11 03:10:18.000000000 +0000 @@ -33,7 +33,7 @@ * and on 32bit ones, whether double is aligned to one word or two words. * Those result in the 6 formats listed below. * - * If any of the assertion errors in fccache.c fail, you need to add a new + * If any of the assertion errors in fcarch.c fail, you need to add a new * architecture. Contact the fontconfig mailing list in that case. * * name endianness pointer-size double-alignment diff -Nru fontconfig-2.10.93/src/fccache.c fontconfig-2.11.0/src/fccache.c --- fontconfig-2.10.93/src/fccache.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/src/fccache.c 2013-10-11 03:10:18.000000000 +0000 @@ -20,9 +20,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "fcint.h" #include "fcarch.h" #include @@ -830,34 +827,6 @@ return NULL; } - -#ifdef _WIN32 -#include -#define mkdir(path,mode) _mkdir(path) -#endif - -static FcBool -FcMakeDirectory (const FcChar8 *dir) -{ - FcChar8 *parent; - FcBool ret; - - if (strlen ((char *) dir) == 0) - return FcFalse; - - parent = FcStrDirname (dir); - if (!parent) - return FcFalse; - if (access ((char *) parent, F_OK) == 0) - ret = mkdir ((char *) dir, 0755) == 0 && chmod ((char *) dir, 0755) == 0; - else if (access ((char *) parent, F_OK) == -1) - ret = FcMakeDirectory (parent) && (mkdir ((char *) dir, 0755) == 0) && chmod ((char *) dir, 0755) == 0; - else - ret = FcFalse; - FcStrFree (parent); - return ret; -} - /* write serialized state to the cache file */ FcBool FcDirCacheWrite (FcCache *cache, FcConfig *config) diff -Nru fontconfig-2.10.93/src/fccfg.c fontconfig-2.11.0/src/fccfg.c --- fontconfig-2.10.93/src/fccfg.c 2013-05-16 04:37:25.000000000 +0000 +++ fontconfig-2.11.0/src/fccfg.c 2013-10-11 03:10:18.000000000 +0000 @@ -214,10 +214,8 @@ while (s) { n = s->next; - if (s->test) - FcTestDestroy (s->test); - if (s->edit) - FcEditDestroy (s->edit); + if (s->rule) + FcRuleDestroy (s->rule); free (s); s = n; } @@ -226,20 +224,20 @@ FcExpr * FcConfigAllocExpr (FcConfig *config) { - if (!config->expr_pool || config->expr_pool->next == config->expr_pool->end) - { - FcExprPage *new_page; - - new_page = malloc (sizeof (FcExprPage)); - if (!new_page) - return 0; - - new_page->next_page = config->expr_pool; - new_page->next = new_page->exprs; - config->expr_pool = new_page; - } + if (!config->expr_pool || config->expr_pool->next == config->expr_pool->end) + { + FcExprPage *new_page; + + new_page = malloc (sizeof (FcExprPage)); + if (!new_page) + return 0; - return config->expr_pool->next++; + new_page->next_page = config->expr_pool; + new_page->next = new_page->exprs; + config->expr_pool = new_page; + } + + return config->expr_pool->next++; } FcConfig * @@ -644,17 +642,17 @@ return FcConfigSetRescanInterval (config, rescanInterval); } - FcBool -FcConfigAddEdit (FcConfig *config, - FcTest *test, - FcEdit *edit, +FcConfigAddRule (FcConfig *config, + FcRule *rule, FcMatchKind kind) { FcSubst *subst, **prev; - FcTest *t; - int num; + FcRule *r; + int n = 0; + if (!rule) + return FcFalse; switch (kind) { case FcMatchPattern: prev = &config->substPattern; @@ -673,18 +671,31 @@ return FcFalse; for (; *prev; prev = &(*prev)->next); *prev = subst; - subst->next = 0; - subst->test = test; - subst->edit = edit; - num = 0; - for (t = test; t; t = t->next) - { - if (t->kind == FcMatchDefault) - t->kind = kind; - num++; + subst->next = NULL; + subst->rule = rule; + for (r = rule; r; r = r->next) + { + switch (r->type) + { + case FcRuleTest: + if (r->u.test && + r->u.test->kind == FcMatchDefault) + r->u.test->kind = kind; + + if (n < r->u.test->object) + n = r->u.test->object; + break; + case FcRuleEdit: + if (n < r->u.edit->object) + n = r->u.edit->object; + break; + default: + break; + } } - if (config->maxObjects < num) - config->maxObjects = num; + n = FC_OBJ_ID (n) - FC_MAX_BASE_OBJECT; + if (config->maxObjects < n) + config->maxObjects = n; if (FcDebug () & FC_DBG_EDIT) { printf ("Add Subst "); @@ -693,11 +704,6 @@ return FcTrue; } -typedef struct _FcSubState { - FcPatternElt *elt; - FcValueList *value; -} FcSubState; - static FcValue FcConfigPromote (FcValue v, FcValue u, FcValuePromotionBuffer *buf) { @@ -721,7 +727,7 @@ FcBool FcConfigCompareValue (const FcValue *left_o, - FcOp op_, + unsigned int op_, const FcValue *right_o) { FcValue left = FcValueCanonicalize(left_o); @@ -736,6 +742,8 @@ if (left.type == right.type) { switch (left.type) { + case FcTypeUnknown: + break; /* No way to guess how to compare for this object */ case FcTypeInteger: break; /* FcConfigPromote prevents this from happening */ case FcTypeDouble: @@ -1484,13 +1492,15 @@ { FcValue v; FcSubst *s; - FcSubState *st; - int i; - FcTest *t; - FcEdit *e; - FcValueList *l; + FcRule *r; + FcValueList *l, **value = NULL, *vl; FcPattern *m; FcStrSet *strs; + FcObject object = FC_INVALID_OBJECT; + FcPatternElt **elt = NULL, *e; + int i, nobjs; + FcBool retval = FcTrue; + FcTest **tst = NULL; if (!config) { @@ -1535,9 +1545,25 @@ return FcFalse; } - st = (FcSubState *) malloc (config->maxObjects * sizeof (FcSubState)); - if (!st && config->maxObjects) - return FcFalse; + nobjs = FC_MAX_BASE_OBJECT + config->maxObjects + 2; + value = (FcValueList **) malloc (SIZEOF_VOID_P * nobjs); + if (!value) + { + retval = FcFalse; + goto bail1; + } + elt = (FcPatternElt **) malloc (SIZEOF_VOID_P * nobjs); + if (!elt) + { + retval = FcFalse; + goto bail1; + } + tst = (FcTest **) malloc (SIZEOF_VOID_P * nobjs); + if (!tst) + { + retval = FcFalse; + goto bail1; + } if (FcDebug () & FC_DBG_EDIT) { @@ -1546,200 +1572,199 @@ } for (; s; s = s->next) { - /* - * Check the tests to see if - * they all match the pattern - */ - for (t = s->test, i = 0; t; t = t->next, i++) + r = s->rule; + for (i = 0; i < nobjs; i++) { - if (FcDebug () & FC_DBG_EDIT) - { - printf ("FcConfigSubstitute test "); - FcTestPrint (t); - } - st[i].elt = 0; - if (kind == FcMatchFont && t->kind == FcMatchPattern) - m = p_pat; - else - m = p; - if (m) - st[i].elt = FcPatternObjectFindElt (m, t->object); - else - st[i].elt = 0; - /* - * If there's no such field in the font, - * then FcQualAll matches while FcQualAny does not - */ - if (!st[i].elt) - { - if (t->qual == FcQualAll) + elt[i] = NULL; + value[i] = NULL; + tst[i] = NULL; + } + for (; r; r = r->next) + { + switch (r->type) { + case FcRuleUnknown: + /* shouldn't be reached */ + break; + case FcRuleTest: + object = FC_OBJ_ID (r->u.test->object); + /* + * Check the tests to see if + * they all match the pattern + */ + if (FcDebug () & FC_DBG_EDIT) { - st[i].value = 0; - continue; + printf ("FcConfigSubstitute test "); + FcTestPrint (r->u.test); } + if (kind == FcMatchFont && r->u.test->kind == FcMatchPattern) + m = p_pat; else - break; - } - /* - * Check to see if there is a match, mark the location - * to apply match-relative edits - */ - st[i].value = FcConfigMatchValueList (m, p_pat, kind, t, st[i].elt->values); - if (!st[i].value) - break; - if (t->qual == FcQualFirst && st[i].value != st[i].elt->values) - break; - if (t->qual == FcQualNotFirst && st[i].value == st[i].elt->values) - break; - } - if (t) - { - if (FcDebug () & FC_DBG_EDIT) - printf ("No match\n"); - continue; - } - if (FcDebug () & FC_DBG_EDIT) - { - printf ("Substitute "); - FcSubstPrint (s); - } - for (e = s->edit; e; e = e->next) - { - /* - * Evaluate the list of expressions - */ - l = FcConfigValues (p, p_pat,kind, e->expr, e->binding); - /* - * Locate any test associated with this field, skipping - * tests associated with the pattern when substituting in - * the font - */ - for (t = s->test, i = 0; t; t = t->next, i++) - { - if ((t->kind == FcMatchFont || kind == FcMatchPattern) && - t->object == e->object) + m = p; + if (m) + e = FcPatternObjectFindElt (m, r->u.test->object); + else + e = NULL; + /* different 'kind' won't be the target of edit */ + if (!elt[object] && kind == r->u.test->kind) { - /* - * KLUDGE - the pattern may have been reallocated or - * things may have been inserted or deleted above - * this element by other edits. Go back and find - * the element again - */ - if (e != s->edit && st[i].elt) - st[i].elt = FcPatternObjectFindElt (p, t->object); - if (!st[i].elt) - t = 0; - break; + elt[object] = e; + tst[object] = r->u.test; } - } - switch (FC_OP_GET_OP (e->op)) { - case FcOpAssign: /* - * If there was a test, then replace the matched - * value with the new list of values + * If there's no such field in the font, + * then FcQualAll matches while FcQualAny does not */ - if (t) + if (!e) { - FcValueList *thisValue = st[i].value; - FcValueList *nextValue = thisValue; - + if (r->u.test->qual == FcQualAll) + { + value[object] = NULL; + continue; + } + else + { + if (FcDebug () & FC_DBG_EDIT) + printf ("No match\n"); + goto bail; + } + } + /* + * Check to see if there is a match, mark the location + * to apply match-relative edits + */ + vl = FcConfigMatchValueList (m, p_pat, kind, r->u.test, e->values); + /* different 'kind' won't be the target of edit */ + if (!value[object] && kind == r->u.test->kind) + value[object] = vl; + if (!vl || + (r->u.test->qual == FcQualFirst && vl != e->values) || + (r->u.test->qual == FcQualNotFirst && vl == e->values)) + { + if (FcDebug () & FC_DBG_EDIT) + printf ("No match\n"); + goto bail; + } + break; + case FcRuleEdit: + object = FC_OBJ_ID (r->u.edit->object); + if (FcDebug () & FC_DBG_EDIT) + { + printf ("Substitute "); + FcEditPrint (r->u.edit); + printf ("\n\n"); + } + /* + * Evaluate the list of expressions + */ + l = FcConfigValues (p, p_pat,kind, r->u.edit->expr, r->u.edit->binding); + if (tst[object] && (tst[object]->kind == FcMatchFont || kind == FcMatchPattern)) + elt[object] = FcPatternObjectFindElt (p, tst[object]->object); + + switch (FC_OP_GET_OP (r->u.edit->op)) { + case FcOpAssign: /* - * Append the new list of values after the current value + * If there was a test, then replace the matched + * value with the new list of values */ - FcConfigAdd (&st[i].elt->values, thisValue, FcTrue, l, e->object); + if (value[object]) + { + FcValueList *thisValue = value[object]; + FcValueList *nextValue = l; + + /* + * Append the new list of values after the current value + */ + FcConfigAdd (&elt[object]->values, thisValue, FcTrue, l, r->u.edit->object); + /* + * Delete the marked value + */ + if (thisValue) + FcConfigDel (&elt[object]->values, thisValue); + /* + * Adjust a pointer into the value list to ensure + * future edits occur at the same place + */ + value[object] = nextValue; + break; + } + /* fall through ... */ + case FcOpAssignReplace: /* - * Delete the marked value + * Delete all of the values and insert + * the new set */ - if (thisValue) - FcConfigDel (&st[i].elt->values, thisValue); + FcConfigPatternDel (p, r->u.edit->object); + FcConfigPatternAdd (p, r->u.edit->object, l, FcTrue); /* - * Adjust any pointers into the value list to ensure - * future edits occur at the same place + * Adjust a pointer into the value list as they no + * longer point to anything valid */ - for (t = s->test, i = 0; t; t = t->next, i++) + value[object] = NULL; + break; + case FcOpPrepend: + if (value[object]) { - if (st[i].value == thisValue) - st[i].value = nextValue; + FcConfigAdd (&elt[object]->values, value[object], FcFalse, l, r->u.edit->object); + break; } + /* fall through ... */ + case FcOpPrependFirst: + FcConfigPatternAdd (p, r->u.edit->object, l, FcFalse); break; - } - /* fall through ... */ - case FcOpAssignReplace: - /* - * Delete all of the values and insert - * the new set - */ - FcConfigPatternDel (p, e->object); - FcConfigPatternAdd (p, e->object, l, FcTrue); - /* - * Adjust any pointers into the value list as they no - * longer point to anything valid - */ - if (t) - { - FcPatternElt *thisElt = st[i].elt; - for (t = s->test, i = 0; t; t = t->next, i++) + case FcOpAppend: + if (value[object]) { - if (st[i].elt == thisElt) - st[i].value = 0; + FcConfigAdd (&elt[object]->values, value[object], FcTrue, l, r->u.edit->object); + break; } - } - break; - case FcOpPrepend: - if (t) - { - FcConfigAdd (&st[i].elt->values, st[i].value, FcFalse, l, e->object); + /* fall through ... */ + case FcOpAppendLast: + FcConfigPatternAdd (p, r->u.edit->object, l, FcTrue); break; - } - /* fall through ... */ - case FcOpPrependFirst: - FcConfigPatternAdd (p, e->object, l, FcFalse); - break; - case FcOpAppend: - if (t) - { - FcConfigAdd (&st[i].elt->values, st[i].value, FcTrue, l, e->object); + case FcOpDelete: + if (value[object]) + { + FcConfigDel (&elt[object]->values, value[object]); + break; + } + /* fall through ... */ + case FcOpDeleteAll: + FcConfigPatternDel (p, r->u.edit->object); + break; + default: + FcValueListDestroy (l); break; } - /* fall through ... */ - case FcOpAppendLast: - FcConfigPatternAdd (p, e->object, l, FcTrue); - break; - case FcOpDelete: - if (t) + /* + * Now go through the pattern and eliminate + * any properties without data + */ + FcConfigPatternCanon (p, r->u.edit->object); + + if (FcDebug () & FC_DBG_EDIT) { - FcConfigDel (&st[i].elt->values, st[i].value); - break; + printf ("FcConfigSubstitute edit"); + FcPatternPrint (p); } - /* fall through ... */ - case FcOpDeleteAll: - FcConfigPatternDel (p, e->object); - break; - default: - FcValueListDestroy (l); break; } } - /* - * Now go through the pattern and eliminate - * any properties without data - */ - for (e = s->edit; e; e = e->next) - FcConfigPatternCanon (p, e->object); - - if (FcDebug () & FC_DBG_EDIT) - { - printf ("FcConfigSubstitute edit"); - FcPatternPrint (p); - } + bail:; } - free (st); if (FcDebug () & FC_DBG_EDIT) { printf ("FcConfigSubstitute done"); FcPatternPrint (p); } - return FcTrue; +bail1: + if (elt) + free (elt); + if (value) + free (value); + if (tst) + free (tst); + + return retval; } FcBool diff -Nru fontconfig-2.10.93/src/fccompat.c fontconfig-2.11.0/src/fccompat.c --- fontconfig-2.10.93/src/fccompat.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/src/fccompat.c 2013-10-11 03:10:18.000000000 +0000 @@ -25,10 +25,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "fcint.h" #include @@ -219,3 +215,30 @@ return result; } + +#ifdef _WIN32 +#include +#define mkdir(path,mode) _mkdir(path) +#endif + +FcBool +FcMakeDirectory (const FcChar8 *dir) +{ + FcChar8 *parent; + FcBool ret; + + if (strlen ((char *) dir) == 0) + return FcFalse; + + parent = FcStrDirname (dir); + if (!parent) + return FcFalse; + if (access ((char *) parent, F_OK) == 0) + ret = mkdir ((char *) dir, 0755) == 0 && chmod ((char *) dir, 0755) == 0; + else if (access ((char *) parent, F_OK) == -1) + ret = FcMakeDirectory (parent) && (mkdir ((char *) dir, 0755) == 0) && chmod ((char *) dir, 0755) == 0; + else + ret = FcFalse; + FcStrFree (parent); + return ret; +} diff -Nru fontconfig-2.10.93/src/fcdbg.c fontconfig-2.11.0/src/fcdbg.c --- fontconfig-2.10.93/src/fcdbg.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/src/fcdbg.c 2013-10-11 03:10:18.000000000 +0000 @@ -30,6 +30,9 @@ _FcValuePrintFile (FILE *f, const FcValue v) { switch (v.type) { + case FcTypeUnknown: + fprintf (f, ""); + break; case FcTypeVoid: fprintf (f, ""); break; @@ -98,6 +101,10 @@ case FcValueBindingSame: printf ("(=)"); break; + default: + /* shouldn't be reached */ + printf ("(?)"); + break; } } @@ -420,21 +427,38 @@ void FcSubstPrint (const FcSubst *subst) { - FcEdit *e; - FcTest *t; + FcRule *r; + FcRuleType last_type = FcRuleUnknown; printf ("match\n"); - for (t = subst->test; t; t = t->next) - { - printf ("\t"); - FcTestPrint (t); - } - printf ("edit\n"); - for (e = subst->edit; e; e = e->next) + for (r = subst->rule; r; r = r->next) { + if (last_type != r->type) + { + switch (r->type) { + case FcRuleTest: + printf ("[test]\n"); + break; + case FcRuleEdit: + printf ("[edit]\n"); + break; + default: + break; + } + last_type = r->type; + } printf ("\t"); - FcEditPrint (e); - printf (";\n"); + switch (r->type) { + case FcRuleTest: + FcTestPrint (r->u.test); + break; + case FcRuleEdit: + FcEditPrint (r->u.edit); + printf (";\n"); + break; + default: + break; + } } printf ("\n"); } diff -Nru fontconfig-2.10.93/src/fcdir.c fontconfig-2.11.0/src/fcdir.c --- fontconfig-2.10.93/src/fcdir.c 2013-01-04 01:47:59.000000000 +0000 +++ fontconfig-2.11.0/src/fcdir.c 2013-10-11 03:10:18.000000000 +0000 @@ -49,6 +49,16 @@ #endif } +FcBool +FcFileIsFile (const FcChar8 *file) +{ + struct stat statb; + + if (FcStat (file, &statb) != 0) + return FcFalse; + return S_ISREG (statb.st_mode); +} + static FcBool FcFileScanFontConfig (FcFontSet *set, FcBlanks *blanks, diff -Nru fontconfig-2.10.93/src/fcfreetype.c fontconfig-2.11.0/src/fcfreetype.c --- fontconfig-2.10.93/src/fcfreetype.c 2013-05-20 08:05:22.000000000 +0000 +++ fontconfig-2.11.0/src/fcfreetype.c 2013-10-11 03:10:18.000000000 +0000 @@ -1105,7 +1105,6 @@ const char *tmp; FcChar8 *hashstr = NULL; - char *fontdata = NULL; FT_Error err; FT_ULong len = 0, alen; @@ -1668,15 +1667,21 @@ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); if (err == FT_Err_Ok) { + char *fontdata; + alen = (len + 63) & ~63; fontdata = malloc (alen); if (!fontdata) goto bail3; err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); if (err != FT_Err_Ok) + { + free (fontdata); goto bail3; + } memset (&fontdata[len], 0, alen - len); hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); + free (fontdata); } else if (err == FT_Err_Invalid_Face_Handle) { @@ -1692,7 +1697,11 @@ if (hashstr) { if (!FcPatternAddString (pat, FC_HASH, hashstr)) + { + free (hashstr); goto bail1; + } + free (hashstr); } bail3: @@ -1783,10 +1792,6 @@ bail2: FcCharSetDestroy (cs); bail1: - if (hashstr) - free (hashstr); - if (fontdata) - free (fontdata); FcPatternDestroy (pat); bail0: return NULL; diff -Nru fontconfig-2.10.93/src/fchash.c fontconfig-2.11.0/src/fchash.c --- fontconfig-2.10.93/src/fchash.c 2013-04-10 09:28:56.000000000 +0000 +++ fontconfig-2.11.0/src/fchash.c 2013-10-11 03:10:18.000000000 +0000 @@ -23,9 +23,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "fcint.h" #include #include @@ -190,14 +187,14 @@ } /* set input size at the end */ len *= 8; - block[63 - 0] = len & 0xff; - block[63 - 1] = (len >> 8) & 0xff; - block[63 - 2] = (len >> 16) & 0xff; - block[63 - 3] = (len >> 24) & 0xff; - block[63 - 4] = (len >> 32) & 0xff; - block[63 - 5] = (len >> 40) & 0xff; - block[63 - 6] = (len >> 48) & 0xff; - block[63 - 7] = (len >> 56) & 0xff; + block[63 - 0] = (uint64_t)len & 0xff; + block[63 - 1] = ((uint64_t)len >> 8) & 0xff; + block[63 - 2] = ((uint64_t)len >> 16) & 0xff; + block[63 - 3] = ((uint64_t)len >> 24) & 0xff; + block[63 - 4] = ((uint64_t)len >> 32) & 0xff; + block[63 - 5] = ((uint64_t)len >> 40) & 0xff; + block[63 - 6] = ((uint64_t)len >> 48) & 0xff; + block[63 - 7] = ((uint64_t)len >> 56) & 0xff; FcHashComputeSHA256Digest (ret, block); return FcHashSHA256ToString (ret); @@ -226,7 +223,7 @@ { if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) { - long v; + uint64_t v; /* add a padding */ memset (&ibuf[len], 0, 64 - len); @@ -281,7 +278,7 @@ { if ((length - i) < 64) { - long v; + uint64_t v; size_t n; /* add a padding */ diff -Nru fontconfig-2.10.93/src/fcint.h fontconfig-2.11.0/src/fcint.h --- fontconfig-2.10.93/src/fcint.h 2013-05-08 02:39:58.000000000 +0000 +++ fontconfig-2.11.0/src/fcint.h 2013-10-11 03:10:18.000000000 +0000 @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -85,7 +86,7 @@ #define FC_DBG_CONFIG 1024 #define FC_DBG_LANGSET 2048 -#define _FC_ASSERT_STATIC1(_line, _cond) typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1] +#define _FC_ASSERT_STATIC1(_line, _cond) typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1] FC_UNUSED #define _FC_ASSERT_STATIC0(_line, _cond) _FC_ASSERT_STATIC1 (_line, (_cond)) #define FC_ASSERT_STATIC(_cond) _FC_ASSERT_STATIC0 (__LINE__, (_cond)) @@ -107,7 +108,9 @@ FC_ASSERT_STATIC (sizeof (FcRef) == sizeof (int)); typedef enum _FcValueBinding { - FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame + FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame, + /* to make sure sizeof (FcValueBinding) == 4 even with -fshort-enums */ + FcValueBindingEnd = INT_MAX } FcValueBinding; #define FcStrdup(s) ((FcChar8 *) strdup ((const char *) (s))) @@ -171,6 +174,12 @@ typedef int FcObject; +/* The 1024 is to leave some room for future added internal objects, such + * that caches from newer fontconfig can still be used with older fontconfig + * without getting confused. */ +#define FC_EXT_OBJ_INDEX 1024 +#define FC_OBJ_ID(_n_) ((_n_) & (~FC_EXT_OBJ_INDEX)) + typedef struct _FcPatternElt *FcPatternEltPtr; /* @@ -271,7 +280,6 @@ #define FcMatchDefault ((FcMatchKind) -1) typedef struct _FcTest { - struct _FcTest *next; FcMatchKind kind; FcQual qual; FcObject object; @@ -280,17 +288,28 @@ } FcTest; typedef struct _FcEdit { - struct _FcEdit *next; FcObject object; FcOp op; FcExpr *expr; FcValueBinding binding; } FcEdit; +typedef enum _FcRuleType { + FcRuleUnknown, FcRuleTest, FcRuleEdit +} FcRuleType; + +typedef struct _FcRule { + struct _FcRule *next; + FcRuleType type; + union { + FcTest *test; + FcEdit *edit; + } u; +} FcRule; + typedef struct _FcSubst { struct _FcSubst *next; - FcTest *test; - FcEdit *edit; + FcRule *rule; } FcSubst; typedef struct _FcCharLeaf { @@ -610,10 +629,9 @@ FcConfigAddBlank (FcConfig *config, FcChar32 blank); -FcPrivate FcBool -FcConfigAddEdit (FcConfig *config, - FcTest *test, - FcEdit *edit, +FcBool +FcConfigAddRule (FcConfig *config, + FcRule *rule, FcMatchKind kind); FcPrivate void @@ -623,7 +641,7 @@ FcPrivate FcBool FcConfigCompareValue (const FcValue *m, - FcOp op, + unsigned int op_, const FcValue *v); FcPrivate FcBool @@ -730,6 +748,9 @@ FcPrivate int32_t FcRandom (void); +FcPrivate FcBool +FcMakeDirectory (const FcChar8 *dir); + /* fcdbg.c */ FcPrivate void @@ -788,6 +809,9 @@ FcFileIsLink (const FcChar8 *file); FcPrivate FcBool +FcFileIsFile (const FcChar8 *file); + +FcPrivate FcBool FcFileScanConfig (FcFontSet *set, FcStrSet *dirs, FcBlanks *blanks, @@ -840,6 +864,9 @@ FcPrivate void FcEditDestroy (FcEdit *e); +void +FcRuleDestroy (FcRule *rule); + /* fclang.c */ FcPrivate FcLangSet * FcFreeTypeLangSet (const FcCharSet *charset, diff -Nru fontconfig-2.10.93/src/fclist.c fontconfig-2.11.0/src/fclist.c --- fontconfig-2.10.93/src/fclist.c 2013-01-04 01:47:59.000000000 +0000 +++ fontconfig-2.11.0/src/fclist.c 2013-10-11 03:10:18.000000000 +0000 @@ -212,6 +212,8 @@ { int i; + if (!p) + return FcFalse; for (i = 0; i < p->num; i++) { FcPatternElt *pe = &FcPatternElts(p)[i]; @@ -252,6 +254,7 @@ { FcValue v = FcValueCanonicalize(value); switch (v.type) { + case FcTypeUnknown: case FcTypeVoid: return 0; case FcTypeInteger: diff -Nru fontconfig-2.10.93/src/fcmatch.c fontconfig-2.11.0/src/fcmatch.c --- fontconfig-2.10.93/src/fcmatch.c 2013-05-20 08:05:22.000000000 +0000 +++ fontconfig-2.11.0/src/fcmatch.c 2013-10-11 03:10:18.000000000 +0000 @@ -245,6 +245,8 @@ typedef enum _FcMatcherPriority { PRI1(HASH), PRI1(FILE), + PRI1(FONTFORMAT), + PRI1(SCALABLE), PRI1(FOUNDRY), PRI1(CHARSET), PRI_FAMILY_STRONG, @@ -550,14 +552,16 @@ continue; } + FcPatternObjectAdd (new, fe->object, v, FcFalse); } else { if (fel) goto copy_lang; - v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); + FcPatternObjectListAdd (new, fe->object, + FcValueListDuplicate (FcPatternEltValues (fe)), + FcTrue); } - FcPatternObjectAdd (new, fe->object, v, FcFalse); } for (i = 0; i < pat->num; i++) { diff -Nru fontconfig-2.10.93/src/fcname.c fontconfig-2.11.0/src/fcname.c --- fontconfig-2.10.93/src/fcname.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/src/fcname.c 2013-10-11 03:10:18.000000000 +0000 @@ -76,6 +76,8 @@ if (t) { switch ((int) t->type) { + case FcTypeUnknown: + return FcTrue; case FcTypeDouble: case FcTypeInteger: if (type == FcTypeDouble || type == FcTypeInteger) @@ -86,7 +88,7 @@ return FcTrue; break; default: - if (t->type == (unsigned int) -1 || type == t->type) + if (type == t->type) return FcTrue; break; } @@ -318,6 +320,12 @@ while ((c = *cur)) { + if (!isspace (c)) + break; + ++cur; + } + while ((c = *cur)) + { if (c == '\\') { ++cur; @@ -468,6 +476,7 @@ FcValue v = FcValueCanonicalize(v0); switch (v.type) { + case FcTypeUnknown: case FcTypeVoid: return FcTrue; case FcTypeInteger: diff -Nru fontconfig-2.10.93/src/fcobjs.c fontconfig-2.11.0/src/fcobjs.c --- fontconfig-2.10.93/src/fcobjs.c 2013-01-04 01:47:59.000000000 +0000 +++ fontconfig-2.11.0/src/fcobjs.c 2013-10-11 03:10:18.000000000 +0000 @@ -37,7 +37,7 @@ /* The 1000 is to leave some room for future added internal objects, such * that caches from newer fontconfig can still be used with older fontconfig * without getting confused. */ -static fc_atomic_int_t next_id = FC_MAX_BASE_OBJECT + 1000; +static fc_atomic_int_t next_id = FC_MAX_BASE_OBJECT + FC_EXT_OBJ_INDEX; struct FcObjectOtherTypeInfo { struct FcObjectOtherTypeInfo *next; FcObjectType object; @@ -63,7 +63,7 @@ return NULL; ot->object.object = (const char *) FcStrdup (str); - ot->object.type = -1; + ot->object.type = FcTypeUnknown; ot->id = fc_atomic_int_add (next_id, +1); ot->next = ots; diff -Nru fontconfig-2.10.93/src/fcobjs.h fontconfig-2.11.0/src/fcobjs.h --- fontconfig-2.10.93/src/fcobjs.h 2013-05-20 08:05:22.000000000 +0000 +++ fontconfig-2.11.0/src/fcobjs.h 2013-10-11 03:10:18.000000000 +0000 @@ -23,7 +23,7 @@ FC_OBJECT (INDEX, FcTypeInteger, NULL) FC_OBJECT (RASTERIZER, FcTypeString, FcCompareString) FC_OBJECT (OUTLINE, FcTypeBool, FcCompareBool) -FC_OBJECT (SCALABLE, FcTypeBool, NULL) +FC_OBJECT (SCALABLE, FcTypeBool, FcCompareBool) FC_OBJECT (DPI, FcTypeDouble, NULL) FC_OBJECT (RGBA, FcTypeInteger, NULL) FC_OBJECT (SCALE, FcTypeDouble, NULL) @@ -35,7 +35,7 @@ FC_OBJECT (LANG, FcTypeLangSet, FcCompareLang) FC_OBJECT (FONTVERSION, FcTypeInteger, FcCompareNumber) FC_OBJECT (CAPABILITY, FcTypeString, NULL) -FC_OBJECT (FONTFORMAT, FcTypeString, NULL) +FC_OBJECT (FONTFORMAT, FcTypeString, FcCompareString) FC_OBJECT (EMBOLDEN, FcTypeBool, NULL) FC_OBJECT (EMBEDDED_BITMAP, FcTypeBool, NULL) FC_OBJECT (DECORATIVE, FcTypeBool, FcCompareBool) diff -Nru fontconfig-2.10.93/src/fcpat.c fontconfig-2.11.0/src/fcpat.c --- fontconfig-2.10.93/src/fcpat.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/src/fcpat.c 2013-10-11 03:10:18.000000000 +0000 @@ -246,6 +246,8 @@ return FcFalse; } switch (va.type) { + case FcTypeUnknown: + return FcFalse; /* don't know how to compare this object */ case FcTypeVoid: return FcTrue; case FcTypeInteger: @@ -294,6 +296,7 @@ FcValueHash (const FcValue *v) { switch (v->type) { + case FcTypeUnknown: case FcTypeVoid: return 0; case FcTypeInteger: @@ -317,7 +320,7 @@ case FcTypeLangSet: return FcLangSetHash (FcValueLangSet(v)); } - return FcFalse; + return 0; } static FcBool diff -Nru fontconfig-2.10.93/src/fcstat.c fontconfig-2.11.0/src/fcstat.c --- fontconfig-2.10.93/src/fcstat.c 2013-01-08 06:42:23.000000000 +0000 +++ fontconfig-2.11.0/src/fcstat.c 2013-10-11 03:10:18.000000000 +0000 @@ -20,9 +20,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "fcint.h" #include "fcarch.h" #include @@ -164,11 +161,21 @@ } #endif +#ifdef HAVE_SCANDIR static int FcDirChecksumScandirSorter(const struct dirent **lhs, const struct dirent **rhs) { return strcmp((*lhs)->d_name, (*rhs)->d_name); } +#elif HAVE_SCANDIR_VOID_P +static int +FcDirChecksumScandirSorter(const void *a, const void *b) +{ + const struct dirent *lhs = a, *rhs = b; + + return strcmp(lhs->d_name, rhs->d_name); +} +#endif static int FcDirChecksum (const FcChar8 *dir, time_t *checksum) diff -Nru fontconfig-2.10.93/src/fcstdint.h fontconfig-2.11.0/src/fcstdint.h --- fontconfig-2.10.93/src/fcstdint.h 2013-05-20 08:44:30.000000000 +0000 +++ fontconfig-2.11.0/src/fcstdint.h 2013-10-11 03:42:14.000000000 +0000 @@ -1,8 +1,8 @@ #ifndef _FONTCONFIG_SRC_FCSTDINT_H #define _FONTCONFIG_SRC_FCSTDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "fontconfig 2.10.93" -/* generated using gnu compiler gcc (GCC) 4.7.2 20121109 (Red Hat 4.7.2-8) */ +#define _GENERATED_STDINT_H "fontconfig 2.11.0" +/* generated using gnu compiler gcc (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1) */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff -Nru fontconfig-2.10.93/src/fcstr.c fontconfig-2.11.0/src/fcstr.c --- fontconfig-2.10.93/src/fcstr.c 2013-05-08 02:53:08.000000000 +0000 +++ fontconfig-2.11.0/src/fcstr.c 2013-10-11 03:10:18.000000000 +0000 @@ -1374,6 +1374,12 @@ return list; } +void +FcStrListFirst (FcStrList *list) +{ + list->n = 0; +} + FcChar8 * FcStrListNext (FcStrList *list) { diff -Nru fontconfig-2.10.93/src/fcxml.c fontconfig-2.11.0/src/fcxml.c --- fontconfig-2.10.93/src/fcxml.c 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/src/fcxml.c 2013-10-11 03:10:18.000000000 +0000 @@ -62,12 +62,30 @@ void FcTestDestroy (FcTest *test) { - if (test->next) - FcTestDestroy (test->next); FcExprDestroy (test->expr); free (test); } +void +FcRuleDestroy (FcRule *rule) +{ + FcRule *n = rule->next; + + switch (rule->type) { + case FcRuleTest: + FcTestDestroy (rule->u.test); + break; + case FcRuleEdit: + FcEditDestroy (rule->u.edit); + break; + default: + break; + } + free (rule); + if (n) + FcRuleDestroy (n); +} + static FcExpr * FcExprCreateInteger (FcConfig *config, int i) { @@ -300,8 +318,6 @@ void FcEditDestroy (FcEdit *e) { - if (e->next) - FcEditDestroy (e->next); if (e->expr) FcExprDestroy (e->expr); free (e); @@ -705,7 +721,7 @@ FcMatchKind kind, FcQual qual, const FcChar8 *field, - FcOp compare, + unsigned int compare, FcExpr *expr) { FcTest *test = (FcTest *) malloc (sizeof (FcTest)); @@ -714,7 +730,6 @@ { const FcObjectType *o; - test->next = 0; test->kind = kind; test->qual = qual; test->object = FcObjectFromName ((const char *) field); @@ -740,7 +755,6 @@ { const FcObjectType *o; - e->next = 0; e->object = object; e->op = op; e->expr = expr; @@ -752,6 +766,34 @@ return e; } +static FcRule * +FcRuleCreate (FcRuleType type, + void *p) +{ + FcRule *r = (FcRule *) malloc (sizeof (FcRule)); + + if (!r) + return NULL; + + r->next = NULL; + r->type = type; + switch (type) + { + case FcRuleTest: + r->u.test = (FcTest *) p; + break; + case FcRuleEdit: + r->u.edit = (FcEdit *) p; + break; + default: + free (r); + r = NULL; + break; + } + + return r; +} + static FcVStack * FcVStackCreateAndPush (FcConfigParse *parse) { @@ -1657,9 +1699,9 @@ FcParseAlias (FcConfigParse *parse) { FcExpr *family = 0, *accept = 0, *prefer = 0, *def = 0, *new = 0; - FcEdit *edit = 0, *next; + FcEdit *edit = 0; FcVStack *vstack; - FcTest *test = NULL; + FcRule *rule = NULL, *r; FcValueBinding binding; if (!FcConfigLexBinding (parse, FcConfigGetAttribute (parse, "binding"), &binding)) @@ -1704,8 +1746,14 @@ vstack->tag = FcVStackNone; break; case FcVStackTest: - vstack->u.test->next = test; - test = vstack->u.test; + if (rule) + { + r = FcRuleCreate (FcRuleTest, vstack->u.test); + r->next = rule; + rule = r; + } + else + rule = FcRuleCreate (FcRuleTest, vstack->u.test); vstack->tag = FcVStackNone; break; default: @@ -1723,8 +1771,35 @@ FcExprDestroy (accept); if (def) FcExprDestroy (def); + if (rule) + FcRuleDestroy (rule); + return; + } + if (!prefer && + !accept && + !def) + { + FcExprDestroy (family); return; } + else + { + FcTest *t = FcTestCreate (parse, FcMatchPattern, + FcQualAny, + (FcChar8 *) FC_FAMILY, + FC_OP (FcOpEqual, FcOpFlagIgnoreBlanks), + family); + if (rule) + { + for (r = rule; r->next; r = r->next); + r->next = FcRuleCreate (FcRuleTest, t); + r = r->next; + } + else + { + r = rule = FcRuleCreate (FcRuleTest, t); + } + } if (prefer) { edit = FcEditCreate (parse, @@ -1732,60 +1807,46 @@ FcOpPrepend, prefer, binding); - if (edit) - edit->next = 0; - else + if (!edit) FcExprDestroy (prefer); + else + { + r->next = FcRuleCreate (FcRuleEdit, edit); + r = r->next; + } } if (accept) { - next = edit; edit = FcEditCreate (parse, FC_FAMILY_OBJECT, FcOpAppend, accept, binding); - if (edit) - edit->next = next; - else + if (!edit) FcExprDestroy (accept); + else + { + r->next = FcRuleCreate (FcRuleEdit, edit); + r = r->next; + } } if (def) { - next = edit; edit = FcEditCreate (parse, FC_FAMILY_OBJECT, FcOpAppendLast, def, binding); - if (edit) - edit->next = next; - else + if (!edit) FcExprDestroy (def); - } - if (edit) - { - FcTest *t = FcTestCreate (parse, FcMatchPattern, - FcQualAny, - (FcChar8 *) FC_FAMILY, - FC_OP (FcOpEqual, FcOpFlagIgnoreBlanks), - family); - if (test) + else { - FcTest *p = test; - - while (p->next) - p = p->next; - p->next = t; + r->next = FcRuleCreate (FcRuleEdit, edit); + r = r->next; } - else - test = t; - if (test) - if (!FcConfigAddEdit (parse->config, test, edit, FcMatchPattern)) - FcTestDestroy (test); } - else - FcExprDestroy (family); + if (!FcConfigAddRule (parse->config, rule, FcMatchPattern)) + FcRuleDestroy (rule); } static FcExpr * @@ -2121,6 +2182,8 @@ FcBool ignore_missing = FcFalse; FcBool deprecated = FcFalse; FcChar8 *prefix = NULL, *p; + static FcChar8 *userdir = NULL; + static FcChar8 *userconf = NULL; s = FcStrBufDoneStatic (&parse->pstack->str); if (!s) @@ -2153,23 +2216,83 @@ memcpy (&prefix[plen + 1], s, dlen); prefix[plen + 1 + dlen] = 0; s = prefix; + if (FcFileIsDir (s)) + { + userdir: + if (!userdir) + userdir = FcStrdup (s); + } + else if (FcFileIsFile (s)) + { + userconf: + if (!userconf) + userconf = FcStrdup (s); + } + else + { + /* No config dir nor file on the XDG directory spec compliant place + * so need to guess what it is supposed to be. + */ + if (FcStrStr (s, (const FcChar8 *)"conf.d") != NULL) + goto userdir; + else + goto userconf; + } } if (!FcConfigParseAndLoad (parse->config, s, !ignore_missing)) parse->error = FcTrue; +#ifndef _WIN32 else { FcChar8 *filename; + static FcBool warn_conf = FcFalse, warn_confd = FcFalse; filename = FcConfigFilename(s); if (deprecated == FcTrue && filename != NULL && !FcFileIsLink (filename)) { - FcConfigMessage (parse, FcSevereWarning, "reading configurations from %s is deprecated.", s); + if (FcFileIsDir (filename)) + { + FcChar8 *parent = FcStrDirname (userdir); + + if (!FcFileIsDir (parent)) + FcMakeDirectory (parent); + FcStrFree (parent); + if (FcFileIsDir (userdir) || + rename ((const char *)filename, (const char *)userdir) != 0 || + symlink ((const char *)userdir, (const char *)filename) != 0) + { + if (!warn_confd) + { + FcConfigMessage (parse, FcSevereWarning, "reading configurations from %s is deprecated. please move it to %s manually", s, userdir); + warn_confd = FcTrue; + } + } + } + else + { + FcChar8 *parent = FcStrDirname (userconf); + + if (!FcFileIsDir (parent)) + FcMakeDirectory (parent); + FcStrFree (parent); + if (FcFileIsFile (userconf) || + rename ((const char *)filename, (const char *)userconf) != 0 || + symlink ((const char *)userconf, (const char *)filename) != 0) + { + if (!warn_conf) + { + FcConfigMessage (parse, FcSevereWarning, "reading configurations from %s is deprecated. please move it to %s manually", s, userconf); + warn_conf = FcTrue; + } + } + } } if(filename) FcStrFree(filename); } +#endif FcStrBufDestroy (&parse->pstack->str); bail: @@ -2386,22 +2509,13 @@ FcEditDestroy (edit); } -typedef struct FcSubstStack { - FcTest *test; - FcEdit *edit; -} FcSubstStack; - static void FcParseMatch (FcConfigParse *parse) { const FcChar8 *kind_name; FcMatchKind kind; - FcTest *test = 0; - FcEdit *edit = 0; FcVStack *vstack; - FcBool tested = FcFalse; - FcSubstStack *sstack = NULL; - int len, pos = 0; + FcRule *rule = NULL, *r; kind_name = FcConfigGetAttribute (parse, "target"); if (!kind_name) @@ -2420,48 +2534,31 @@ return; } } - len = FcVStackElements(parse); - if (len > 0) - { - sstack = malloc (sizeof (FcSubstStack) * (len + 1)); - if (!sstack) - { - FcConfigMessage (parse, FcSevereError, "out of memory"); - return; - } - } while ((vstack = FcVStackPeek (parse))) { switch ((int) vstack->tag) { case FcVStackTest: - vstack->u.test->next = test; - test = vstack->u.test; + r = FcRuleCreate (FcRuleTest, vstack->u.test); + if (rule) + r->next = rule; + rule = r; vstack->tag = FcVStackNone; - tested = FcTrue; break; case FcVStackEdit: - /* due to the reverse traversal, node appears faster than - * node if any. so we have to deal with it here rather than - * the above in FcVStackTest, and put recipes in reverse order. - */ - if (tested) - { - sstack[pos].test = test; - sstack[pos].edit = edit; - pos++; - test = NULL; - edit = NULL; - tested = FcFalse; - } - vstack->u.edit->next = edit; - edit = vstack->u.edit; - vstack->tag = FcVStackNone; - if (kind == FcMatchScan && edit->object > FC_MAX_BASE_OBJECT) + if (kind == FcMatchScan && vstack->u.edit->object > FC_MAX_BASE_OBJECT) { FcConfigMessage (parse, FcSevereError, " cannot edit user-defined object \"%s\"", - FcObjectName(edit->object)); + FcObjectName(vstack->u.edit->object)); + if (rule) + FcRuleDestroy (rule); + return; } + r = FcRuleCreate (FcRuleEdit, vstack->u.edit); + if (rule) + r->next = rule; + rule = r; + vstack->tag = FcVStackNone; break; default: FcConfigMessage (parse, FcSevereWarning, "invalid match element"); @@ -2469,22 +2566,8 @@ } FcVStackPopAndDestroy (parse); } - if (!FcConfigAddEdit (parse->config, test, edit, kind)) + if (!FcConfigAddRule (parse->config, rule, kind)) FcConfigMessage (parse, FcSevereError, "out of memory"); - if (sstack) - { - int i; - - for (i = 0; i < pos; i++) - { - if (!FcConfigAddEdit (parse->config, sstack[pos - i - 1].test, sstack[pos - i - 1].edit, kind)) - { - FcConfigMessage (parse, FcSevereError, "out of memory"); - return; - } - } - free (sstack); - } } static void diff -Nru fontconfig-2.10.93/test/Makefile.am fontconfig-2.11.0/test/Makefile.am --- fontconfig-2.10.93/test/Makefile.am 2013-04-04 03:09:46.000000000 +0000 +++ fontconfig-2.11.0/test/Makefile.am 2013-10-11 03:10:18.000000000 +0000 @@ -16,14 +16,17 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) +check_PROGRAMS = test-migration if HAVE_PTHREAD -check_PROGRAMS = test-pthread -noinst_PROGRAMS = $(check_PROGRAMS) +check_PROGRAMS += test-pthread test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la # We don't enable this test by default because it will require config and fonts # to meaningfully test anything, and we are not installed yet. #TESTS += test-pthread endif +noinst_PROGRAMS = $(check_PROGRAMS) + +test_migration_LDADD = $(top_builddir)/src/libfontconfig.la EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA) diff -Nru fontconfig-2.10.93/test/Makefile.in fontconfig-2.11.0/test/Makefile.in --- fontconfig-2.10.93/test/Makefile.in 2013-05-20 08:44:35.000000000 +0000 +++ fontconfig-2.11.0/test/Makefile.in 2013-10-11 04:28:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,9 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_PTHREAD_TRUE@check_PROGRAMS = test-pthread$(EXEEXT) +check_PROGRAMS = test-migration$(EXEEXT) $(am__EXEEXT_1) +@HAVE_PTHREAD_TRUE@am__append_1 = test-pthread subdir = test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_for_build.m4 \ @@ -67,15 +96,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +@HAVE_PTHREAD_TRUE@am__EXEEXT_1 = test-pthread$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) -test_pthread_SOURCES = test-pthread.c -test_pthread_OBJECTS = test-pthread.$(OBJEXT) -@HAVE_PTHREAD_TRUE@test_pthread_DEPENDENCIES = \ -@HAVE_PTHREAD_TRUE@ $(top_builddir)/src/libfontconfig.la +test_migration_SOURCES = test-migration.c +test_migration_OBJECTS = test-migration.$(OBJEXT) +test_migration_DEPENDENCIES = $(top_builddir)/src/libfontconfig.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +test_pthread_SOURCES = test-pthread.c +test_pthread_OBJECTS = test-pthread.$(OBJEXT) +@HAVE_PTHREAD_TRUE@test_pthread_DEPENDENCIES = \ +@HAVE_PTHREAD_TRUE@ $(top_builddir)/src/libfontconfig.la AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -110,19 +143,54 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = test-pthread.c -DIST_SOURCES = test-pthread.c +SOURCES = test-migration.c test-pthread.c +DIST_SOURCES = test-migration.c test-pthread.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -278,7 +346,7 @@ # '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", # since that might cause problem with VPATH rewrites for suffix-less tests. -# See also 'test-harness-vpath-rewrite.test' and 'test-trs-basic.test'. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ @@ -385,6 +453,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_REQUIRES = @PKGCONFIG_REQUIRES@ +PKGCONFIG_REQUIRES_PRIVATELY = @PKGCONFIG_REQUIRES_PRIVATELY@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -414,7 +484,6 @@ am__tar = @am__tar@ am__untar = @am__untar@ ax_pthread_config = @ax_pthread_config@ -baseconfigdir = @baseconfigdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -422,7 +491,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ -configdir = @configdir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -456,11 +524,9 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -templatedir = @templatedir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -xmldir = @xmldir@ check_SCRIPTS = run-test.sh TEST_EXTENSIONS = \ .sh \ @@ -475,11 +541,12 @@ TESTS = run-test.sh TESTDATA = 4x6.pcf 8x16.pcf out.expected fonts.conf.in AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -@HAVE_PTHREAD_TRUE@noinst_PROGRAMS = $(check_PROGRAMS) @HAVE_PTHREAD_TRUE@test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la # We don't enable this test by default because it will require config and fonts # to meaningfully test anything, and we are not installed yet. #TESTS += test-pthread +noinst_PROGRAMS = $(check_PROGRAMS) +test_migration_LDADD = $(top_builddir)/src/libfontconfig.la EXTRA_DIST = $(check_SCRIPTS) $(TESTDATA) CLEANFILES = all: all-am @@ -534,6 +601,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + +test-migration$(EXEEXT): $(test_migration_OBJECTS) $(test_migration_DEPENDENCIES) $(EXTRA_test_migration_DEPENDENCIES) + @rm -f test-migration$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_migration_OBJECTS) $(test_migration_LDADD) $(LIBS) + test-pthread$(EXEEXT): $(test_pthread_OBJECTS) $(test_pthread_DEPENDENCIES) $(EXTRA_test_pthread_DEPENDENCIES) @rm -f test-pthread$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_pthread_OBJECTS) $(test_pthread_LDADD) $(LIBS) @@ -544,6 +616,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-migration.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pthread.Po@am__quote@ .c.o: @@ -573,26 +646,15 @@ clean-libtool: -rm -rf .libs _libs -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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -604,15 +666,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -621,9 +679,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -648,7 +707,7 @@ $(MAKE) $(AM_MAKEFLAGS) $< # Leading 'am--fnord' is there to ensure the list of targets does not -# exand to empty, as could happen e.g. with make check TESTS=''. +# expand to empty, as could happen e.g. with make check TESTS=''. am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) am--force-recheck: @: @@ -938,9 +997,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS cscopelist ctags distclean \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -950,7 +1009,8 @@ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am recheck tags uninstall uninstall-am + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am -include $(top_srcdir)/git.mk diff -Nru fontconfig-2.10.93/test/test-migration.c fontconfig-2.11.0/test/test-migration.c --- fontconfig-2.10.93/test/test-migration.c 1970-01-01 00:00:00.000000000 +0000 +++ fontconfig-2.11.0/test/test-migration.c 2013-10-11 03:10:18.000000000 +0000 @@ -0,0 +1,172 @@ +#include +#include +#include +#include +#include +#include +#include + +FcBool +mkdir_p(const char *dir) +{ + char *parent; + FcBool ret; + + if (strlen (dir) == 0) + return FcFalse; + parent = (char *) FcStrDirname (dir); + if (!parent) + return FcFalse; + if (access (parent, F_OK) == 0) + ret = mkdir (dir, 0755) == 0 && chmod (dir, 0755) == 0; + else if (access (parent, F_OK) == -1) + ret = mkdir_p (parent) && (mkdir (dir, 0755) == 0) && chmod (dir, 0755) == 0; + else + ret = FcFalse; + free (parent); + + return ret; +} + +FcBool +unlink_dirs(const char *dir) +{ + DIR *d = opendir (dir); + struct dirent *e; + size_t len = strlen (dir); + char *n = NULL; + FcBool ret = FcTrue; + + if (!d) + return FcFalse; + while ((e = readdir(d)) != NULL) + { + size_t l; + + if (strcmp (e->d_name, ".") == 0 || + strcmp (e->d_name, "..") == 0) + continue; + l = strlen (e->d_name) + 1; + if (n) + free (n); + n = malloc (l + len + 1); + strcpy (n, dir); + n[len] = '/'; + strcpy (&n[len + 1], e->d_name); + if (e->d_type == DT_DIR) + { + if (!unlink_dirs (n)) + { + fprintf (stderr, "E: %s\n", n); + ret = FcFalse; + break; + } + } + else + { + if (unlink (n) == -1) + { + fprintf (stderr, "E: %s\n", n); + ret = FcFalse; + break; + } + } + } + if (n) + free (n); + closedir (d); + + if (rmdir (dir) == -1) + { + fprintf (stderr, "E: %s\n", dir); + return FcFalse; + } + + return ret; +} + +int +main(void) +{ + char template[32] = "fontconfig-XXXXXXXX"; + char *tmp = mkdtemp (template); + size_t len = strlen (tmp), xlen, dlen; + char xdg[256], confd[256], fn[256], nfn[256], ud[256], nud[256]; + int ret = -1; + FILE *fp; + char *content = ""; + + strcpy (xdg, tmp); + strcpy (&xdg[len], "/.config"); + setenv ("HOME", tmp, 1); + setenv ("XDG_CONFIG_HOME", xdg, 1); + xlen = strlen (xdg); + strcpy (confd, xdg); + strcpy (&confd[xlen], "/fontconfig"); + dlen = strlen (confd); + /* In case there are no configuration files nor directory */ + FcInit (); + if (access (confd, F_OK) == 0) + { + fprintf (stderr, "%s unexpectedly exists\n", confd); + goto bail; + } + FcFini (); + if (!unlink_dirs (tmp)) + { + fprintf (stderr, "Unable to clean up\n"); + goto bail; + } + /* In case there are the user configuration file */ + strcpy (fn, tmp); + strcpy (&fn[len], "/.fonts.conf"); + strcpy (nfn, confd); + strcpy (&nfn[dlen], "/fonts.conf"); + if (!mkdir_p (confd)) + { + fprintf (stderr, "Unable to create a config dir: %s\n", confd); + goto bail; + } + if ((fp = fopen (fn, "wb")) == NULL) + { + fprintf (stderr, "Unable to create a config file: %s\n", fn); + goto bail; + } + fwrite (content, sizeof (char), strlen (content), fp); + fclose (fp); + FcInit (); + if (access (nfn, F_OK) != 0) + { + fprintf (stderr, "migration failed for %s\n", nfn); + goto bail; + } + FcFini (); + if (!unlink_dirs (tmp)) + { + fprintf (stderr, "Unable to clean up\n"); + goto bail; + } + /* In case there are the user configuration dir */ + strcpy (ud, tmp); + strcpy (&ud[len], "/.fonts.conf.d"); + strcpy (nud, confd); + strcpy (&nud[dlen], "/conf.d"); + if (!mkdir_p (ud)) + { + fprintf (stderr, "Unable to create a config dir: %s\n", ud); + goto bail; + } + FcInit (); + if (access (nud, F_OK) != 0) + { + fprintf (stderr, "migration failed for %s\n", nud); + goto bail; + } + FcFini (); + + ret = 0; +bail: + unlink_dirs (tmp); + + return ret; +} diff -Nru fontconfig-2.10.93/test-driver fontconfig-2.11.0/test-driver --- fontconfig-2.10.93/test-driver 2012-09-26 14:03:18.000000000 +0000 +++ fontconfig-2.11.0/test-driver 2013-06-17 09:16:35.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh -# test-driver - basic driver script for the 'parallel-tests' mode. +# test-driver - basic testsuite driver script. scriptversion=2012-06-27.10; # UTC -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by