On 04/15/14 04:48 AM, Thomas Klausner wrote:
On Mon, Apr 14, 2014 at 07:43:06PM +0200, Julien Cristau wrote:
This release features a number of spec formatting improvements, and some
header adjustments for current xserver.
This release breaks libXfont-1.4.7, the current libXfont release, for
me. I see:
--- patcache.lo ---
patcache.c:130:1: error: conflicting types for 'CacheFontPattern'
CacheFontPattern (FontPatternCachePtr cache,
^
In file included from
/scratch/x11/libXfont/work/.buildlink/include/X11/fonts/fontstruct.h:28:0,
from patcache.c:35:
/scratch/x11/libXfont/work/.buildlink/include/X11/fonts/font.h:141:18: note:
previous declaration of 'CacheFontPattern' was here
extern void CacheFontPattern (
^
patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'
FindCachedFontPattern (FontPatternCachePtr cache,
^
In file included from
/scratch/x11/libXfont/work/.buildlink/include/X11/fonts/fontstruct.h:28:0,
from patcache.c:35:
/scratch/x11/libXfont/work/.buildlink/include/X11/fonts/font.h:151:21: note:
previous declaration of 'FindCachedFontPattern' was here
extern FontPtr FindCachedFontPattern (
^
I've reproduced this here as well. Here's my proposal to handle this
incompatible change:
- make a libXfont-1.4-branch to use for stable releases to get bug fixes
to users of xorg-server-1.15 and older. It's configure.ac will
require fontsproto < 2.1.3 for compatibility. It will have everything
in the current git master branch except for Keith's commit that
constified the arguments to CacheFontPattern & FindCachedFontPattern.
I've got some bug fixes that need to go into this branch soon, then
I'll cut a 1.4.8 off it.
- update the version in the master branch to 1.4.99.0 for now, with a
RC once we get patches in for at least:
- the cygwin/mingw patch in http://patchwork.freedesktop.org/patch/23708/
- the configure.ac patch I just posted for fontsproto >= 2.13
- making --disable-snfformat the default, as warned in the README
The goal will be to have libXfont 1.5.0 ready for xorg-server-1.16.0.
--
-Alan Coopersmith- [email protected]
Oracle Solaris Engineering - http://blogs.oracle.com/alanc
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
