[gentoo-commits] repo/gentoo:master commit in: games-engines/love/files/

[gentoo-commits] repo/gentoo:master commit in: games-engines/love/files/

[Michael Sterrett]

commit:     606ebaaccb4571ff3822e4f919490072c2274183
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 17:52:59 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 17:53:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606ebaac

update freetype patch to deal with the change from 2.6 to 2.6.1 from Polynomial-C via bug #562398

Package-Manager: portage-2.2.20.1

 .../love/files/love-0.8.0-freetype2.patch          | 48 ++++++++--------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/games-engines/love/files/love-0.8.0-freetype2.patch b/games-engines/love/files/love-0.8.0-freetype2.patch
index 64e42c5..07c655c 100644
--- a/games-engines/love/files/love-0.8.0-freetype2.patch
+++ b/games-engines/love/files/love-0.8.0-freetype2.patch
@@ -1,48 +1,34 @@
---- src/modules/font/freetype/TrueTypeRasterizer.h.old	2015-01-07 09:49:39.394000727 +0100
-+++ src/modules/font/freetype/TrueTypeRasterizer.h	2015-01-07 09:50:28.846065847 +0100
-@@ -27,10 +27,10 @@
- 
- // TrueType2
+--- love-0.8.0/src/modules/font/freetype/Font.h
++++ love-0.8.0/src/modules/font/freetype/Font.h
+@@ -30,10 +30,10 @@
+ #else
  #include <ft2build.h>
+ #endif
 -#include <freetype/freetype.h>
 -#include <freetype/ftglyph.h>
 -#include <freetype/ftoutln.h>
 -#include <freetype/fttrigon.h>
-+#include <freetype.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
-+#include <fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
  
  namespace love
  {
-@@ -67,4 +67,4 @@
- } // font
- } // love
+--- love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
++++ love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
+@@ -27,10 +27,10 @@
  
--#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
-\ No newline at end of file
-+#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
---- src/modules/font/freetype/Font.h.old	2015-01-07 09:49:20.421359400 +0100
-+++ src/modules/font/freetype/Font.h	2015-01-07 09:50:02.076571918 +0100
-@@ -30,10 +30,10 @@
- #else
+ // TrueType2
  #include <ft2build.h>
- #endif
 -#include <freetype/freetype.h>
 -#include <freetype/ftglyph.h>
 -#include <freetype/ftoutln.h>
 -#include <freetype/fttrigon.h>
-+#include <freetype.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
-+#include <fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
  
  namespace love
  {
-@@ -73,4 +73,4 @@
- } // font
- } // love
- 
--#endif // LOVE_FONT_FREETYPE_FONT_H
-\ No newline at end of file
-+#endif // LOVE_FONT_FREETYPE_FONT_H