summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-03-17 04:05:13 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-03-17 04:05:13 +0000
commitac0fbf9de3da467a43daddd479c9bbe8fd63a5bc (patch)
tree21f20595b9cb107f42aaad840480cc738e96efa1 /gnome-base
parentVersion bump. (diff)
downloadgentoo-2-ac0fbf9de3da467a43daddd479c9bbe8fd63a5bc.tar.gz
gentoo-2-ac0fbf9de3da467a43daddd479c9bbe8fd63a5bc.tar.bz2
gentoo-2-ac0fbf9de3da467a43daddd479c9bbe8fd63a5bc.zip
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)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/libgnomeprint/ChangeLog10
-rw-r--r--gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch55
-rw-r--r--gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild5
3 files changed, 66 insertions, 4 deletions
diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog
index 5586c4c16b7f..28b3a3f38f0e 100644
--- a/gnome-base/libgnomeprint/ChangeLog
+++ b/gnome-base/libgnomeprint/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-base/libgnomeprint
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.194 2012/05/29 14:24:01 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.195 2014/03/17 04:05:13 tetromino Exp $
+
+ 17 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+ libgnomeprint-2.18.8.ebuild,
+ +files/libgnomeprint-2.18.8-freetype-2.5.1.patch:
+ Fix building with >=freetype-2.5.1 (bug #504850, thanks to Harris
+ Landgarten).
29 May 2012; Alexis Ballier <aballier@gentoo.org>
libgnomeprint-2.18.8.ebuild:
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
new file mode 100644
index 000000000000..c21e92177c5f
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
@@ -0,0 +1,55 @@
+From 9ed3ddc0cefd9aec123eeee3ce494289bf080495 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@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
+
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
index 7a4e886b4ab5..118929720c8d 100644
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.11 2012/05/29 14:24:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.12 2014/03/17 04:05:13 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -45,6 +45,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-stdio-include.patch
+ epatch "${FILESDIR}"/${P}-freetype-2.5.1.patch
gnome2_src_prepare
# Drop DEPRECATED flags, bug #384807