View | Details | Raw Unified | Return to bug 203554 | Differences between
and this patch

Collapse All | Expand All

(-)audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt (-11 / +11 lines)
Lines 1-11 Link Here
1
--- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig	2013-12-24 21:48:53.000000000 +0200
1
--- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig	2013-06-11 17:46:42.000000000 +0200
2
+++ plugins/zynaddsubfx/fltk/CMakeLists.txt	2013-12-24 21:49:16.000000000 +0200
2
+++ plugins/zynaddsubfx/fltk/CMakeLists.txt	2015-10-21 10:24:19.901416000 +0200
3
@@ -165,7 +165,7 @@
3
@@ -139,7 +139,7 @@
4
 mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H)
4
 find_file(HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
5
 
5
 find_file(HAVE_DIRENT_H dirent.h)
6
 # where to find freetype headers
6
 find_file(HAVE_DLFCN_H dlfcn.h)
7
-find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2)
7
-find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2)
8
+find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2)
8
+find_file(HAVE_FREETYPE_H ft2build.h PATH_SUFFIXES freetype2)
9
 if(FREETYPE_PATH)
9
 find_file(HAVE_GL_GL_H GL/gl.h)
10
    include_directories(${FREETYPE_PATH})
10
 find_file(HAVE_GL_GLU_H GL/glu.h)
11
 endif(FREETYPE_PATH)
11
 find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
(-)graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake (-9 lines)
Lines 1-14 Link Here
1
--- cmake/FindFreetype2.cmake.orig	2013-12-24 19:02:55.000000000 +0100
1
--- cmake/FindFreetype2.cmake.orig	2013-12-24 19:02:55.000000000 +0100
2
+++ cmake/FindFreetype2.cmake	2013-12-24 19:03:21.000000000 +0100
2
+++ cmake/FindFreetype2.cmake	2013-12-24 19:03:21.000000000 +0100
3
@@ -52,7 +52,7 @@
4
 #
5
 
6
 
7
-FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h
8
+FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h
9
        ${ADDITIONAL_INCLUDE_PATH}
10
       /usr/include
11
       /usr/include/freetype2
12
@@ -67,7 +67,7 @@
3
@@ -67,7 +67,7 @@
13
       NO_DEFAULT_PATH
4
       NO_DEFAULT_PATH
14
 )
5
 )
(-)graphics/xpaint/Makefile (-3 / +1 lines)
Lines 26-33 Link Here
26
USES=		ghostscript:run jpeg libtool:build shebangfix tar:bzip2
26
USES=		ghostscript:run jpeg libtool:build shebangfix tar:bzip2
27
SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
27
SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
28
28
29
CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
29
CPPFLAGS+=	-I${LOCALBASE}/include
30
		-I${LOCALBASE}/include/freetype2/freetype
31
LIBS+=		-L${LOCALBASE}/lib
30
LIBS+=		-L${LOCALBASE}/lib
32
MAKE_ENV+=	RM="${RM} -f"
31
MAKE_ENV+=	RM="${RM} -f"
33
32
Lines 34-40 Link Here
34
post-patch:
33
post-patch:
35
	@${RM} -f ${WRKSRC}/XPaint.ad
34
	@${RM} -f ${WRKSRC}/XPaint.ad
36
	@${REINPLACE_CMD} -e 's/-ldl //' \
35
	@${REINPLACE_CMD} -e 's/-ldl //' \
37
		-e 's|freetype/||g' \
38
		${WRKSRC}/configure ${WRKSRC}/rw/configure
36
		${WRKSRC}/configure ${WRKSRC}/rw/configure
39
	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
37
	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
40
		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
38
		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
(-)graphics/xpaint/files/patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.orig	2015-12-03 20:52:59.771668000 +0100
2
+++ configure	2015-12-03 20:53:09.226361000 +0100
3
@@ -5611,7 +5611,7 @@
4
 $as_echo_n "checking location of freetype2 headers... " >&6; }
5
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6
 /* end confdefs.h.  */
7
-#include <freetype2/config/ftheader.h>
8
+#include <freetype2/freetype/config/ftheader.h>
9
 int
10
 main ()
11
 {
(-)graphics/xpaint/files/patch-rw_configure (+11 lines)
Line 0 Link Here
1
--- rw/configure.orig	2015-12-03 20:56:32.251228000 +0100
2
+++ rw/configure	2015-12-03 20:56:55.905547000 +0100
3
@@ -11691,7 +11691,7 @@
4
 $as_echo_n "checking location of freetype2 headers... " >&6; }
5
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6
 /* end confdefs.h.  */
7
-#include <freetype2/config/ftheader.h>
8
+#include <freetype2/freetype/config/ftheader.h>
9
 int
10
 main ()
11
 {
(-)multimedia/ffmpeg0/Makefile (-1 lines)
Lines 321-327 Link Here
321
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
321
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
322
	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
322
	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
323
		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
323
		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
324
		-e 's|freetype/freetype.h|freetype.h|g' \
325
		-e 's|check_ldflags -Wl,--as-needed||' \
324
		-e 's|check_ldflags -Wl,--as-needed||' \
326
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
325
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
327
	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
326
	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
(-)print/freetype2/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	freetype2
4
PORTNAME=	freetype2
5
PORTVERSION=	2.6
5
PORTVERSION=	2.6.2
6
PORTREVISION=	1
7
CATEGORIES=	print
6
CATEGORIES=	print
8
MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
7
MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
9
		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
8
		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
(-)print/freetype2/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
1
SHA256 (freetype-2.6.2.tar.bz2) = baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892
2
SIZE (freetype-2.6.tar.bz2) = 1726219
2
SIZE (freetype-2.6.2.tar.bz2) = 1767940
(-)print/freetype2/files/patch-5cd2155 (-163 lines)
Lines 1-163 Link Here
1
Revert commit below to fix cut off text
2
3
https://savannah.nongnu.org/bugs/?45520
4
5
From 5cd21551131ef3a9690ecbefcc9782286ee5199e Mon Sep 17 00:00:00 2001
6
From: Werner Lemberg <wl@gnu.org>
7
Date: Fri, 10 Apr 2015 05:01:01 +0000
8
Subject: [cff] Update advance width handling to OpenType 1.7.
9
10
Problem reported by Behdad.
11
12
* src/cff/cffdrivr.c (cff_get_advances): Handle SFNT case
13
separately.
14
15
* src/cff/cffgload.c (cff_slot_load): Use advance width and side
16
bearing values from `hmtx' table if present.
17
---
18
19
--- src/cff/cffdrivr.c.orig	2015-04-28 09:15:13.000000000 +0200
20
+++ src/cff/cffdrivr.c	2015-07-25 17:42:23.025572000 +0200
21
@@ -195,68 +195,6 @@
22
     FT_GlyphSlot  slot  = face->glyph;
23
 
24
 
25
-    if ( FT_IS_SFNT( face ) )
26
-    {
27
-      /* OpenType 1.7 mandates that the data from `hmtx' table be used; */
28
-      /* it is no longer necessary that those values are identical to   */
29
-      /* the values in the `CFF' table                                  */
30
-
31
-      TT_Face   ttface = (TT_Face)face;
32
-      FT_Short  dummy;
33
-
34
-
35
-      if ( flags & FT_LOAD_VERTICAL_LAYOUT )
36
-      {
37
-        /* check whether we have data from the `vmtx' table at all; */
38
-        /* otherwise we extract the info from the CFF glyphstrings  */
39
-        /* (instead of synthesizing a global value using the `OS/2' */
40
-        /* table)                                                   */
41
-        if ( !ttface->vertical_info )
42
-          goto Missing_Table;
43
-
44
-        for ( nn = 0; nn < count; nn++ )
45
-        {
46
-          FT_UShort  ah;
47
-
48
-
49
-          ( (SFNT_Service)ttface->sfnt )->get_metrics( ttface,
50
-                                                       1,
51
-                                                       start + nn,
52
-                                                       &dummy,
53
-                                                       &ah );
54
-
55
-          FT_TRACE5(( "  idx %d: advance height %d font units\n",
56
-                      start + nn, ah ));
57
-          advances[nn] = ah;
58
-        }
59
-      }
60
-      else
61
-      {
62
-        /* check whether we have data from the `hmtx' table at all */
63
-        if ( !ttface->horizontal.number_Of_HMetrics )
64
-          goto Missing_Table;
65
-
66
-        for ( nn = 0; nn < count; nn++ )
67
-        {
68
-          FT_UShort  aw;
69
-
70
-
71
-          ( (SFNT_Service)ttface->sfnt )->get_metrics( ttface,
72
-                                                       0,
73
-                                                       start + nn,
74
-                                                       &dummy,
75
-                                                       &aw );
76
-
77
-          FT_TRACE5(( "  idx %d: advance width %d font units\n",
78
-                      start + nn, aw ));
79
-          advances[nn] = aw;
80
-        }
81
-      }
82
-
83
-      return error;
84
-    }
85
-
86
-  Missing_Table:
87
     flags |= (FT_UInt32)FT_LOAD_ADVANCE_ONLY;
88
 
89
     for ( nn = 0; nn < count; nn++ )
90
--- src/cff/cffgload.c.orig	2015-04-16 07:02:23.000000000 +0200
91
+++ src/cff/cffgload.c	2015-07-25 17:42:23.027008000 +0200
92
@@ -2725,7 +2725,7 @@
93
                                 face->vertical_info                   &&
94
                                 face->vertical.number_Of_VMetrics > 0 );
95
 
96
-          /* get the vertical metrics from the vmtx table if we have one */
97
+          /* get the vertical metrics from the vtmx table if we have one */
98
           if ( has_vertical_info )
99
           {
100
             (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
101
@@ -2953,43 +2953,25 @@
102
         FT_Bool            has_vertical_info;
103
 
104
 
105
-        if ( face->horizontal.number_Of_HMetrics )
106
-        {
107
-          FT_Short   horiBearingX = 0;
108
-          FT_UShort  horiAdvance  = 0;
109
-
110
-
111
-          ( (SFNT_Service)face->sfnt )->get_metrics( face, 0,
112
-                                                     glyph_index,
113
-                                                     &horiBearingX,
114
-                                                     &horiAdvance );
115
-          metrics->horiAdvance          = horiAdvance;
116
-          metrics->horiBearingX         = horiBearingX;
117
-          glyph->root.linearHoriAdvance = horiAdvance;
118
-        }
119
-        else
120
-        {
121
-          /* copy the _unscaled_ advance width */
122
-          metrics->horiAdvance          = decoder.glyph_width;
123
-          glyph->root.linearHoriAdvance = decoder.glyph_width;
124
-        }
125
-
126
+        /* copy the _unscaled_ advance width */
127
+        metrics->horiAdvance                    = decoder.glyph_width;
128
+        glyph->root.linearHoriAdvance           = decoder.glyph_width;
129
         glyph->root.internal->glyph_transformed = 0;
130
 
131
         has_vertical_info = FT_BOOL( face->vertical_info                   &&
132
                                      face->vertical.number_Of_VMetrics > 0 );
133
 
134
-        /* get the vertical metrics from the vmtx table if we have one */
135
+        /* get the vertical metrics from the vtmx table if we have one */
136
         if ( has_vertical_info )
137
         {
138
           FT_Short   vertBearingY = 0;
139
           FT_UShort  vertAdvance  = 0;
140
 
141
 
142
-          ( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
143
-                                                     glyph_index,
144
-                                                     &vertBearingY,
145
-                                                     &vertAdvance );
146
+          (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
147
+                                                           glyph_index,
148
+                                                           &vertBearingY,
149
+                                                           &vertAdvance );
150
           metrics->vertBearingY = vertBearingY;
151
           metrics->vertAdvance  = vertAdvance;
152
         }
153
@@ -3064,9 +3046,7 @@
154
         metrics->width  = cbox.xMax - cbox.xMin;
155
         metrics->height = cbox.yMax - cbox.yMin;
156
 
157
-        if ( !face->horizontal.number_Of_HMetrics )
158
-          metrics->horiBearingX = cbox.xMin;
159
-
160
+        metrics->horiBearingX = cbox.xMin;
161
         metrics->horiBearingY = cbox.yMax;
162
 
163
         if ( has_vertical_info )
(-)print/freetype2/files/patch-builds_unix_detect.mk (-11 / +7 lines)
Lines 1-5 Link Here
1
--- builds/unix/detect.mk.orig	2015-03-11 01:47:10.000000000 -0400
1
--- builds/unix/detect.mk.orig	2015-09-25 07:58:57.000000000 +0200
2
+++ builds/unix/detect.mk	2015-06-16 05:45:17.176216000 -0400
2
+++ builds/unix/detect.mk	2015-10-04 12:35:05.733855000 +0200
3
@@ -22,6 +22,9 @@
3
@@ -22,6 +22,9 @@
4
                      $(wildcard /usr/sbin/init) \
4
                      $(wildcard /usr/sbin/init) \
5
                      $(wildcard /dev/null) \
5
                      $(wildcard /dev/null) \
Lines 10-30 Link Here
10
   ifneq ($(is_unix),)
10
   ifneq ($(is_unix),)
11
 
11
 
12
     PLATFORM := unix
12
     PLATFORM := unix
13
@@ -81,12 +84,12 @@
13
@@ -80,10 +83,10 @@
14
   ifdef must_configure
14
   ifdef must_configure
15
     ifneq ($(have_Makefile),)
15
     ifneq ($(have_Makefile),)
16
       # we are building FT2 not in the src tree
16
       # we are building FT2 not in the src tree
17
-	      CONFIG_SHELL="$(CONFIG_SHELL)" \
17
-	        $(TOP_DIR)/builds/unix/configure $(value CFG)
18
-	        $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
18
+#	        $(TOP_DIR)/builds/unix/configure $(value CFG)
19
+#	      CONFIG_SHELL="$(CONFIG_SHELL)" \
20
+#	        $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
21
     else
19
     else
22
-	      cd builds/unix; \
20
-	      cd builds/unix; \
23
-	      CONFIG_SHELL="$(CONFIG_SHELL)" \
21
-	        ./configure $(value CFG)
24
-	        $(CONFIG_SHELL) ./configure $(value CFG)
25
+#	      cd builds/unix; \
22
+#	      cd builds/unix; \
26
+#	      CONFIG_SHELL="$(CONFIG_SHELL)" \
23
+#	        ./configure $(value CFG)
27
+#	        $(CONFIG_SHELL) ./configure $(value CFG)
28
     endif
24
     endif
29
   endif
25
   endif
30
 
26
 
(-)print/freetype2/pkg-plist (-51 / +51 lines)
Lines 1-59 Link Here
1
bin/freetype-config
1
bin/freetype-config
2
include/freetype2/config/ftconfig.h
2
include/freetype2/freetype/config/ftconfig.h
3
include/freetype2/config/ftheader.h
3
include/freetype2/freetype/config/ftheader.h
4
include/freetype2/config/ftmodule.h
4
include/freetype2/freetype/config/ftmodule.h
5
include/freetype2/config/ftoption.h
5
include/freetype2/freetype/config/ftoption.h
6
include/freetype2/config/ftstdlib.h
6
include/freetype2/freetype/config/ftstdlib.h
7
include/freetype2/freetype.h
7
include/freetype2/freetype/freetype.h
8
include/freetype2/freetype/ftadvanc.h
9
include/freetype2/freetype/ftautoh.h
10
include/freetype2/freetype/ftbbox.h
11
include/freetype2/freetype/ftbdf.h
12
include/freetype2/freetype/ftbitmap.h
13
include/freetype2/freetype/ftbzip2.h
14
include/freetype2/freetype/ftcache.h
15
include/freetype2/freetype/ftcffdrv.h
16
include/freetype2/freetype/ftchapters.h
17
include/freetype2/freetype/ftcid.h
18
include/freetype2/freetype/fterrdef.h
19
include/freetype2/freetype/fterrors.h
20
include/freetype2/freetype/ftfntfmt.h
21
include/freetype2/freetype/ftgasp.h
22
include/freetype2/freetype/ftglyph.h
23
include/freetype2/freetype/ftgxval.h
24
include/freetype2/freetype/ftgzip.h
25
include/freetype2/freetype/ftimage.h
26
include/freetype2/freetype/ftincrem.h
27
include/freetype2/freetype/ftlcdfil.h
28
include/freetype2/freetype/ftlist.h
29
include/freetype2/freetype/ftlzw.h
30
include/freetype2/freetype/ftmac.h
31
include/freetype2/freetype/ftmm.h
32
include/freetype2/freetype/ftmodapi.h
33
include/freetype2/freetype/ftmoderr.h
34
include/freetype2/freetype/ftotval.h
35
include/freetype2/freetype/ftoutln.h
36
include/freetype2/freetype/ftpfr.h
37
include/freetype2/freetype/ftrender.h
38
include/freetype2/freetype/ftsizes.h
39
include/freetype2/freetype/ftsnames.h
40
include/freetype2/freetype/ftstroke.h
41
include/freetype2/freetype/ftsynth.h
42
include/freetype2/freetype/ftsystem.h
43
include/freetype2/freetype/fttrigon.h
44
include/freetype2/freetype/ftttdrv.h
45
include/freetype2/freetype/fttypes.h
46
include/freetype2/freetype/ftwinfnt.h
47
include/freetype2/freetype/t1tables.h
48
include/freetype2/freetype/ttnameid.h
49
include/freetype2/freetype/tttables.h
50
include/freetype2/freetype/tttags.h
51
include/freetype2/freetype/ttunpat.h
8
include/freetype2/ft2build.h
52
include/freetype2/ft2build.h
9
include/freetype2/ftadvanc.h
10
include/freetype2/ftautoh.h
11
include/freetype2/ftbbox.h
12
include/freetype2/ftbdf.h
13
include/freetype2/ftbitmap.h
14
include/freetype2/ftbzip2.h
15
include/freetype2/ftcache.h
16
include/freetype2/ftcffdrv.h
17
include/freetype2/ftchapters.h
18
include/freetype2/ftcid.h
19
include/freetype2/fterrdef.h
20
include/freetype2/fterrors.h
21
include/freetype2/ftfntfmt.h
22
include/freetype2/ftgasp.h
23
include/freetype2/ftglyph.h
24
include/freetype2/ftgxval.h
25
include/freetype2/ftgzip.h
26
include/freetype2/ftimage.h
27
include/freetype2/ftincrem.h
28
include/freetype2/ftlcdfil.h
29
include/freetype2/ftlist.h
30
include/freetype2/ftlzw.h
31
include/freetype2/ftmac.h
32
include/freetype2/ftmm.h
33
include/freetype2/ftmodapi.h
34
include/freetype2/ftmoderr.h
35
include/freetype2/ftotval.h
36
include/freetype2/ftoutln.h
37
include/freetype2/ftpfr.h
38
include/freetype2/ftrender.h
39
include/freetype2/ftsizes.h
40
include/freetype2/ftsnames.h
41
include/freetype2/ftstroke.h
42
include/freetype2/ftsynth.h
43
include/freetype2/ftsystem.h
44
include/freetype2/fttrigon.h
45
include/freetype2/ftttdrv.h
46
include/freetype2/fttypes.h
47
include/freetype2/ftwinfnt.h
48
include/freetype2/t1tables.h
49
include/freetype2/ttnameid.h
50
include/freetype2/tttables.h
51
include/freetype2/tttags.h
52
include/freetype2/ttunpat.h
53
lib/libfreetype.a
53
lib/libfreetype.a
54
lib/libfreetype.so
54
lib/libfreetype.so
55
lib/libfreetype.so.6
55
lib/libfreetype.so.6
56
lib/libfreetype.so.6.12.0
56
lib/libfreetype.so.6.12.2
57
libdata/pkgconfig/freetype2.pc
57
libdata/pkgconfig/freetype2.pc
58
man/man1/freetype-config.1.gz
58
man/man1/freetype-config.1.gz
59
share/aclocal/freetype2.m4
59
share/aclocal/freetype2.m4
(-)www/firefox/files/patch-1194520 (+35 lines)
Line 0 Link Here
1
From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
2
From: Mike Hommey <mh+mozilla@glandium.org>
3
Date: Fri, 14 Aug 2015 08:50:38 +0900
4
Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
5
 <freetype/ftfntfmt.h>
6
7
---
8
 config/system-headers | 1 +
9
 1 file changed, 1 insertion(+)
10
11
diff --git a/config/system-headers b/config/system-headers
12
index bee35da..ad1f88d 100644
13
--- config/system-headers
14
+++ config/system-headers
15
@@ -450,16 +450,17 @@ foundation/base64.h
16
 foundation/hexdump.h
17
 #endif
18
 fp.h
19
 fpieee.h
20
 frame/log.h
21
 frame/req.h
22
 freetype/freetype.h
23
 freetype/ftcache.h
24
+freetype/ftfntfmt.h
25
 freetype/ftglyph.h
26
 freetype/ftsynth.h
27
 freetype/ftoutln.h
28
 freetype/ttnameid.h
29
 freetype/tttables.h
30
 freetype/t1tables.h
31
 freetype/ftlcdfil.h
32
 freetype/ftsizes.h
33
-- 
34
2.5.0.3.ge81d485
35
(-)www/seamonkey/files/patch-1194520 (+35 lines)
Line 0 Link Here
1
From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
2
From: Mike Hommey <mh+mozilla@glandium.org>
3
Date: Fri, 14 Aug 2015 08:50:38 +0900
4
Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
5
 <freetype/ftfntfmt.h>
6
7
---
8
 config/system-headers | 1 +
9
 1 file changed, 1 insertion(+)
10
11
diff --git a/config/system-headers b/config/system-headers
12
index bee35da..ad1f88d 100644
13
--- mozilla/config/system-headers
14
+++ mozilla/config/system-headers
15
@@ -450,16 +450,17 @@ foundation/base64.h
16
 foundation/hexdump.h
17
 #endif
18
 fp.h
19
 fpieee.h
20
 frame/log.h
21
 frame/req.h
22
 freetype/freetype.h
23
 freetype/ftcache.h
24
+freetype/ftfntfmt.h
25
 freetype/ftglyph.h
26
 freetype/ftsynth.h
27
 freetype/ftoutln.h
28
 freetype/ttnameid.h
29
 freetype/tttables.h
30
 freetype/t1tables.h
31
 freetype/ftlcdfil.h
32
 freetype/ftsizes.h
33
-- 
34
2.5.0.3.ge81d485
35
(-)x11-fm/xfe/files/patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.orig	2015-10-21 16:59:07.344253000 +0200
2
+++ configure	2015-10-21 16:59:18.245643000 +0200
3
@@ -14940,7 +14940,7 @@
4
 	  LIBS="$LIBS $freetype_libs"
5
 	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
6
 	fi
7
-	ac_fn_cxx_check_header_mongrel "$LINENO" "config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
8
+	ac_fn_cxx_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
9
 if test "x$ac_cv_header_config_ftheader_h" = xyes; then :
10
 
11
 else
(-)x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake (-8 / +3 lines)
Lines 1-6 Link Here
1
--- cmake/modules/FREETYPEConfig.cmake.orig	2008-04-07 23:45:10.000000000 +0300
1
--- cmake/modules/FREETYPEConfig.cmake.orig	2008-04-07 22:45:10.000000000 +0200
2
+++ cmake/modules/FREETYPEConfig.cmake	2013-12-23 19:53:13.000000000 +0200
2
+++ cmake/modules/FREETYPEConfig.cmake	2015-12-02 14:40:47.871063000 +0100
3
@@ -1,14 +1,14 @@
3
@@ -1,10 +1,10 @@
4
 #
4
 #
5
 # Find the native FREETYPE includes and library
5
 # Find the native FREETYPE includes and library
6
 # (from Scribus)
6
 # (from Scribus)
Lines 15-22 Link Here
15
     NO_CMAKE_SYSTEM_PATH
15
     NO_CMAKE_SYSTEM_PATH
16
   )
16
   )
17
 
17
 
18
-  FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
19
+  FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
20
     /usr/include/freetype2
21
     /usr/local/include/freetype2
22
     /usr/X11R6/include/freetype2

Return to bug 203554