Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/fontconfig/patches/fontconfig-2.12.1-glibc225.patch

    Annotation of /trunk/fontconfig/patches/fontconfig-2.12.1-glibc225.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2856 - (hide annotations) (download)
    Tue Mar 14 13:27:59 2017 UTC (7 years, 2 months ago) by niro
    File size: 1570 byte(s) 
    -fixed ftbfs with glibc-2.25
    1 niro 2856 glibc 2.25+ has now defined these macros in <limits.h>
    2     https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
    3    
    4     Create an alias for FC_CHAR_WIDTH for ABI compatibility
    5    
    6     Signed-off-by: Khem Raj <raj.khem@xxxxxxxxx>
    7     ---
    8     fontconfig/fontconfig.h | 3 ++-
    9     src/fcobjs.h | 2 +-
    10     2 files changed, 3 insertions(+), 2 deletions(-)
    11    
    12     diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
    13     index 5c72b22..070a557 100644
    14     --- a/fontconfig/fontconfig.h
    15     +++ b/fontconfig/fontconfig.h
    16     @@ -128,7 +128,8 @@ typedef int FcBool;
    17     #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
    18    
    19     /* Adjust outline rasterizer */
    20     -#define FC_CHAR_WIDTH "charwidth" /* Int */
    21     +#define FC_CHARWIDTH "charwidth" /* Int */
    22     +#define FC_CHAR_WIDTH FC_CHARWIDTH
    23     #define FC_CHAR_HEIGHT "charheight"/* Int */
    24     #define FC_MATRIX "matrix" /* FcMatrix */
    25    
    26     diff --git a/src/fcobjs.h b/src/fcobjs.h
    27     index 1fc4f65..d27864b 100644
    28     --- a/src/fcobjs.h
    29     +++ b/src/fcobjs.h
    30     @@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
    31     FC_OBJECT (RGBA, FcTypeInteger, NULL)
    32     FC_OBJECT (SCALE, FcTypeDouble, NULL)
    33     FC_OBJECT (MINSPACE, FcTypeBool, NULL)
    34     -FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
    35     +FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
    36     FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
    37     FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
    38     FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)
    39     --
    40     2.10.2