tetromino    14/03/17 04:05:13

  Added:                libgnomeprint-2.18.8-freetype-2.5.1.patch
  Log:
  Fix building with >=freetype-2.5.1 (bug #504850, thanks to Harris Landgarten).
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
CF0ADD61)

Revision  Changes    Path
1.1                  
gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch?rev=1.1&content-type=text/plain

Index: libgnomeprint-2.18.8-freetype-2.5.1.patch
===================================================================
>From 9ed3ddc0cefd9aec123eeee3ce494289bf080495 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetrom...@gentoo.org>
Date: Mon, 17 Mar 2014 00:01:10 -0400
Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1

---
 libgnomeprint/gnome-font-face.c | 2 +-
 libgnomeprint/gnome-print-gdi.c | 2 +-
 libgnomeprint/gnome-rfont.c     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c
index 0447377..f9f8f3e 100644
--- a/libgnomeprint/gnome-font-face.c
+++ b/libgnomeprint/gnome-font-face.c
@@ -36,7 +36,7 @@
 #include <stdarg.h>
 #include <locale.h>
 
-#include <freetype/ftoutln.h>
+#include <ftoutln.h>
 
 #include <libgnomeprint/gnome-print-private.h>
 #include <libgnomeprint/gnome-font-private.h>
diff --git a/libgnomeprint/gnome-print-gdi.c b/libgnomeprint/gnome-print-gdi.c
index f89a8e8..d30672b 100755
--- a/libgnomeprint/gnome-print-gdi.c
+++ b/libgnomeprint/gnome-print-gdi.c
@@ -36,7 +36,7 @@
 #include <libgnomeprint/gp-gc-private.h>
 
 #include <ft2build.h>
-#include <freetype/freetype.h>
+#include <freetype.h>
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/libgnomeprint/gnome-rfont.c b/libgnomeprint/gnome-rfont.c
index 55ec261..09e5a6e 100644
--- a/libgnomeprint/gnome-rfont.c
+++ b/libgnomeprint/gnome-rfont.c
@@ -28,8 +28,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/ftglyph.h>
-#include <freetype/ftbbox.h>
+#include <ftglyph.h>
+#include <ftbbox.h>
 #include <libart_lgpl/art_misc.h>
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_vpath.h>
-- 
1.9.0





Reply via email to