Fontsproto-2.1.3 breaks libXfont-1.4.7

[Miklos Karacsony]

Heres's what I've got, when I tried to build it:

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 (
                     ^

[Miklos Karacsony]

patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'
 FindCachedFontPattern (FontPatternCachePtr cache,
 ^
In file included from /usr/include/X11/fonts/fontstruct.h:28:0,
                 from patcache.c:35:
/usr/include/X11/fonts/font.h:151:21: note: previous declaration of 'FindCachedFontPattern' was here
 extern FontPtr      FindCachedFontPattern (
                     ^

[Miklos Karacsony]

libXfont-1.4.7 not libXft-1.4.7 sorry.

[Miklos Karacsony]

This patch will fix the build

[Armin K]

​http://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=d279ffa49284b5e5f787f76edbe8c52226534a64

This is official upstream fix.

[Fernando de Oliveira]

Replying to Krejzi:

​http://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=d279ffa49284b5e5f787f76edbe8c52226534a64

This is official upstream fix.

Thanks, Armin, but it did not seem to work.

[Fernando de Oliveira]

Thanks Miklos,

The patch worked.

[Fernando de Oliveira]

Thanks Miklos K. for reporting and fixing, and Armin K. for confirming.

Fixed at r12990.

[Armin K]

You may need more patches from git repo than the one I linked to. I believe I applied more than one to check which one will fix the build.

[Fernando de Oliveira]

Sorry, I was not precise.

The one you linked to just failed to patch: chunk rejected.

[Armin K]

Works here, make sure you apply it on clean source. It does however also require this patch in addition to the first one:

​http://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=a96cc1f032a059da89319ceccb6659c8edd446fb

[Fernando de Oliveira]

Seems I did not form the patch from upstream correctly. Trying again.

[Fernando de Oliveira]

Problem was the patch was not properly formed by me.

Modifying the book to use upstream fixes.

Thanks, Armin.

Fixed at r12991.