Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2857 - (hide annotations) (download)
Tue Mar 14 15:26:21 2017 UTC (7 years, 3 months ago) by niro
File size: 1257 byte(s)
-fixed patch
1 niro 2857 diff -Naur fontconfig-2.12.1/fontconfig/fontconfig.h fontconfig-2.12.1-glibc225/fontconfig/fontconfig.h
2     --- fontconfig-2.12.1/fontconfig/fontconfig.h 2016-08-05 07:47:02.000000000 +0200
3     +++ fontconfig-2.12.1-glibc225/fontconfig/fontconfig.h 2017-03-14 16:25:06.746744335 +0100
4     @@ -128,7 +128,8 @@
5     #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
6    
7 niro 2856 /* Adjust outline rasterizer */
8 niro 2857 -#define FC_CHAR_WIDTH "charwidth" /* Int */
9     +#define FC_CHARWIDTH "charwidth" /* Int */
10     +#define FC_CHAR_WIDTH FC_CHARWIDTH
11     #define FC_CHAR_HEIGHT "charheight"/* Int */
12     #define FC_MATRIX "matrix" /* FcMatrix */
13    
14     diff -Naur fontconfig-2.12.1/src/fcobjs.h fontconfig-2.12.1-glibc225/src/fcobjs.h
15     --- fontconfig-2.12.1/src/fcobjs.h 2016-07-11 04:41:06.000000000 +0200
16     +++ fontconfig-2.12.1-glibc225/src/fcobjs.h 2017-03-14 16:24:54.269875771 +0100
17     @@ -51,7 +51,7 @@
18     FC_OBJECT (RGBA, FcTypeInteger, NULL)
19     FC_OBJECT (SCALE, FcTypeDouble, NULL)
20     FC_OBJECT (MINSPACE, FcTypeBool, NULL)
21     -FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
22     +FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
23     FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
24     FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
25     FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)