From: Tristan Heaven <tristan@gentoo.org>
Date: Mon, 12 Feb 2007 08:26:05 +0000 (+0000)
Subject: Fix for freetype-2.2 - bug #166467
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64f15922dcccfe02f09a8ebcdac883ecda612673;p=gentoo.git

Fix for freetype-2.2 - bug #166467
Package-Manager: portage-2.1.2-r9
---

diff --git a/media-libs/sge/ChangeLog b/media-libs/sge/ChangeLog
index c35be32b8947..78555e247f5a 100644
--- a/media-libs/sge/ChangeLog
+++ b/media-libs/sge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sge
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sge/ChangeLog,v 1.1 2006/04/08 03:00:44 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sge/ChangeLog,v 1.2 2007/02/12 08:26:05 nyhm Exp $
+
+  12 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  files/sge-030809-freetype.patch:
+  Fix for freetype-2.2 - bug #166467
 
 *sge-030809 (07 Apr 2006)
 
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index 1b44fdb957b3..463f3ce07974 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -1,31 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d3997da7a8467b304bf15b2a6d0a761b ChangeLog 352
-RMD160 b61783801ee6b740580ac06ba836091eb902c1de ChangeLog 352
-SHA256 72cb585309d9708fc57aaa326988c311690031dd4a00c20f41837d96898fe997 ChangeLog 352
-MD5 152ef6734e4e8aa0ebf8fce94211cdca files/digest-sge-030809 229
-RMD160 681f790ac806dc29acc1e94ac62601c34b97bde6 files/digest-sge-030809 229
-SHA256 2c2c3e896cc3391a451770f6bec22c5feaaef0d9f5c2d6d28389b07e33415d04 files/digest-sge-030809 229
+AUX sge-030809-build.patch 4020 RMD160 09021b5d1ca5b0f4b030de763f9b387ccb8fd808 SHA1 6b2cb17ddb451d32e10dfd58f67e89b80f9b1ca9 SHA256 53f8e2ab8080f14edfed161055f01ccc94a1d44c7e478ce40fc0dcbd794d4f94
 MD5 c87f0516c8d624cbd9358cbd8bc53418 files/sge-030809-build.patch 4020
 RMD160 09021b5d1ca5b0f4b030de763f9b387ccb8fd808 files/sge-030809-build.patch 4020
 SHA256 53f8e2ab8080f14edfed161055f01ccc94a1d44c7e478ce40fc0dcbd794d4f94 files/sge-030809-build.patch 4020
+AUX sge-030809-cmap.patch 684 RMD160 b7a9b3c31f09e43e27b2bc38c07573f25e5acef9 SHA1 1f5b358840ce924c1cc84723d7c07fa28efa9d2b SHA256 264bf8966bdb13a47491af1e4417e31a7f8e94ece40c30a1f2d94b95d9e120f5
 MD5 a4ec1e5af5f23193ac092739f8155777 files/sge-030809-cmap.patch 684
 RMD160 b7a9b3c31f09e43e27b2bc38c07573f25e5acef9 files/sge-030809-cmap.patch 684
 SHA256 264bf8966bdb13a47491af1e4417e31a7f8e94ece40c30a1f2d94b95d9e120f5 files/sge-030809-cmap.patch 684
-MD5 885ebaa2645549742fee3c3a783de59a files/sge-030809-freetype.patch 324
-RMD160 b8ab28d19026878059aed9ee6841f644a0bdcfb2 files/sge-030809-freetype.patch 324
-SHA256 330c360ac7fbdbbc5c1ba5ac90e5053606ec459131b5ec38f8c92d08edc12b03 files/sge-030809-freetype.patch 324
+AUX sge-030809-freetype.patch 621 RMD160 726d5c7923b262b74406930a458fe645fd1b00a1 SHA1 f83a325fd40dd65b1ff17c02888f0199ba426f3d SHA256 a537b98f3282881393ce6270a91564b4554eaec0ef9eacd51ea4b07048f80d79
+MD5 63515b96c5d0909b1d1784606d252c60 files/sge-030809-freetype.patch 621
+RMD160 726d5c7923b262b74406930a458fe645fd1b00a1 files/sge-030809-freetype.patch 621
+SHA256 a537b98f3282881393ce6270a91564b4554eaec0ef9eacd51ea4b07048f80d79 files/sge-030809-freetype.patch 621
+DIST sge030809.tar.gz 251698 RMD160 c3c2484e27e9ddce754cc9471720a7c33becbbc3 SHA1 c7da60e837d685f6024074298e9f7e6eb76ea860 SHA256 25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc
+EBUILD sge-030809.ebuild 1239 RMD160 974b2e647b63817581bf79227a9a581dedbae5f1 SHA1 a097190b089905be2fc1e3b6b01eb58986c3b1d2 SHA256 ce1cf83e1bf12e7d2b889bb7967b90b8e215a05ad5ea16474fad74dda2bec5ee
+MD5 09a38141b24e3352f98852931d25f353 sge-030809.ebuild 1239
+RMD160 974b2e647b63817581bf79227a9a581dedbae5f1 sge-030809.ebuild 1239
+SHA256 ce1cf83e1bf12e7d2b889bb7967b90b8e215a05ad5ea16474fad74dda2bec5ee sge-030809.ebuild 1239
+MISC ChangeLog 471 RMD160 4b94a08918b18bd0dc4c0cb224169db849b08d74 SHA1 db3596afc14e85700df0a671cf13656cc3608f67 SHA256 f2d97482d29f9b8ce8fd916777ce72ac4709f1eca0dc4ad0e0f7e50d56722272
+MD5 2733c794f15b7e407b96d7ff7c0b4822 ChangeLog 471
+RMD160 4b94a08918b18bd0dc4c0cb224169db849b08d74 ChangeLog 471
+SHA256 f2d97482d29f9b8ce8fd916777ce72ac4709f1eca0dc4ad0e0f7e50d56722272 ChangeLog 471
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 1e6a27496992a1329e78fef061abba5b sge-030809.ebuild 1241
-RMD160 4a0dbf2da017cc3f437683b30f5c4cacc7db8dab sge-030809.ebuild 1241
-SHA256 acea9a0610dc316fc9c4e41bf09d97b188816429951f384b1a48dec959052c32 sge-030809.ebuild 1241
+MD5 152ef6734e4e8aa0ebf8fce94211cdca files/digest-sge-030809 229
+RMD160 681f790ac806dc29acc1e94ac62601c34b97bde6 files/digest-sge-030809 229
+SHA256 2c2c3e896cc3391a451770f6bec22c5feaaef0d9f5c2d6d28389b07e33415d04 files/digest-sge-030809 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFEOAIF2+ySkm8kpY0RAvUGAKCMwnD3UZ4ntqBk2d2l5acB1JuoiQCcCPKX
-MIbkmgxBF3OPM3IUTBBR90U=
-=k58V
+iD8DBQFF0CSkdz7hIScOURERAm+nAJ9IwMwGG6wIjeBIv/VD13Nh+A6evgCeJFEk
+u84XvUPcZg35b4mxg8gtnKI=
+=97TH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/sge/files/sge-030809-freetype.patch b/media-libs/sge/files/sge-030809-freetype.patch
index 6de197901635..7b638e4100f9 100644
--- a/media-libs/sge/files/sge-030809-freetype.patch
+++ b/media-libs/sge/files/sge-030809-freetype.patch
@@ -1,11 +1,25 @@
---- sge_tt_text.cpp.orig	2006-03-28 23:57:23.000000000 -0500
-+++ sge_tt_text.cpp	2006-03-28 23:58:03.000000000 -0500
-@@ -36,6 +36,8 @@
+--- sge_tt_text.cpp
++++ sge_tt_text.cpp
+@@ -36,10 +36,9 @@
  #include "sge_textpp.h"
  
  #ifndef _SGE_NOTTF
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
+-#include <freetype/internal/ftobjs.h>
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
- #include <freetype/freetype.h>
- #include <freetype/ftoutln.h>
- #include <freetype/ttnameid.h>
++#include FT_OUTLINE_H
+ 
+ /* The structure used to hold glyph information (cached) */
+ struct glyph {
+@@ -294,7 +293,7 @@
+ 	}
+ 	memset(stream, 0, sizeof(*stream));
+ 
+-	stream->memory = _sge_library->memory;
++	stream->memory = NULL;
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index 6e645c8e0fa2..3274d7e3151d 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sge/sge-030809.ebuild,v 1.2 2006/04/08 18:32:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sge/sge-030809.ebuild,v 1.3 2007/02/12 08:26:04 nyhm Exp $
 
 inherit eutils