Gentoo Archives: gentoo-commits

From:	"Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in media-libs/coin/files: coin-3.1.3-freetype251.patch
Date:	Fri, 21 Mar 2014 20:53:08
Message-Id:	`20140321205301.5C0C82004F@flycatcher.gentoo.org`

1	polynomial-c 14/03/21 20:53:01
2
3	Added: coin-3.1.3-freetype251.patch
4	Log:
5	Fixed compilation with >=freetype-2.5.1 (bug #504556)
6
7	(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
8
9	Revision Changes Path
10	1.1 media-libs/coin/files/coin-3.1.3-freetype251.patch
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-freetype251.patch?rev=1.1&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-freetype251.patch?rev=1.1&content-type=text/plain
14
15	Index: coin-3.1.3-freetype251.patch
16	===================================================================
17	--- Coin-3.1.3/src/glue/freetype.cpp
18	+++ Coin-3.1.3/src/glue/freetype.cpp
19	@@ -52,9 +52,9 @@
20	#ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */
21	#define FREETYPEGLUE_ASSUME_FREETYPE 1
22	#include <ft2build.h>
23	-#include <freetype/freetype.h>
24	-#include <freetype/ftglyph.h>
25	-#include <freetype/ftoutln.h>
26	+#include FT_FREETYPE_H
27	+#include FT_GLYPH_H
28	+#include FT_OUTLINE_H
29	#endif /* FREETYPEGLUE_ASSUME_FREETYPE */
30
31	#include <Inventor/C/basic.h>
32	--- Coin-3.1.3/src/glue/freetype.h
33	+++ Coin-3.1.3/src/glue/freetype.h
34	@@ -87,8 +87,8 @@
35
36	#ifdef HAVE_FREETYPE
37	#include <ft2build.h>
38	-#include <freetype/freetype.h>
39	-#include <freetype/ftglyph.h>
40	+#include FT_FREETYPE_H
41	+#include FT_GLYPH_H
42	#else /* HAVE_FREETYPE */
43
44	#include <Inventor/C/basic.h>