libXfont: Changes to 'master'

[Alan Coopersmith]

 configure.ac         |    4 ++--
 src/fontfile/bufio.c |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 21f5d3ec9d833b8bce08d0749b8001e1e88544ac
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Apr 21 22:05:20 2014 -0700

    Bump version to 1.4.99.0 for master branch (to become 1.5)
    
    libXfont 1.5.0 will be synchronized with the fontsproto 2.1.3 API
    changes needed for xorg-server 1.16 branch.
    
    libXfont 1.4.x will be left for stable release branch for older
    Xserver releases.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 5a398a55ccdd92d0ff05793692ef8e57f3a50198
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Apr 20 18:10:07 2014 -0700

    Require fontsproto 2.1.3 for matching function prototypes
    
    Building current libXfont git against fontsproto 2.1.2 causes clang
    complaints of:
    
    patcache.c:130:1: error: conflicting types for 'CacheFontPattern'
    CacheFontPattern (FontPatternCachePtr cache,
    ^
    patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'
    FindCachedFontPattern (FontPatternCachePtr cache,
    ^
    
    due to the constification of arguments not matching.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Thomas Klausner <wiz at NetBSD.org>

commit c77a0784bdfc8c178f0742689cf6ae02a2fce37f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Apr 20 17:59:14 2014 -0700

    Check if pointer returned by BufFileCreate is NULL before writing to it
    
    Fixes clang analyzer warning:
    
    bufio.c:165:13: warning: Access to field 'bufp' results in a dereference
     of a null pointer (loaded from variable 'f')
        f->bufp = f->buffer;
        ~       ^
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Thomas Klausner <wiz at NetBSD.org>