diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-02-02 02:31:03 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-02-02 02:31:03 +0000 |
| commit | 8415d6d3e2ca4353fad6525b8e83510074299b81 (patch) | |
| tree | 3b17bf56864a61def5883ac382332a8d7e0a06a1 /media-libs/ftgl | |
| parent | Mark 0.5.5.1-r3 stable on ia64 (diff) | |
| download | historical-8415d6d3e2ca4353fad6525b8e83510074299b81.tar.gz historical-8415d6d3e2ca4353fad6525b8e83510074299b81.tar.bz2 historical-8415d6d3e2ca4353fad6525b8e83510074299b81.zip | |
Add a GCC 4.1 compile fix per #120835.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'media-libs/ftgl')
| -rw-r--r-- | media-libs/ftgl/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/ftgl/Manifest | 21 | ||||
| -rw-r--r-- | media-libs/ftgl/files/ftgl-2.1.2-gcc41.patch | 11 | ||||
| -rw-r--r-- | media-libs/ftgl/ftgl-2.1.2-r1.ebuild | 5 |
4 files changed, 38 insertions, 7 deletions
diff --git a/media-libs/ftgl/ChangeLog b/media-libs/ftgl/ChangeLog index 99c7a7035c63..5adae4f53fe4 100644 --- a/media-libs/ftgl/ChangeLog +++ b/media-libs/ftgl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/ftgl -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.5 2005/12/10 21:13:49 tgall Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.6 2006/02/02 02:31:03 joshuabaergen Exp $ + + 02 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/ftgl-2.1.2-gcc41.patch, ftgl-2.1.2-r1.ebuild: + Add a GCC 4.1 compile fix per #120835. 10 Dec 2005; Tom Gall <tgall@gentoo.org> ftgl-2.1.2-r1.ebuild: added ~ppc64 diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest index 1504dc723fe6..ef0a1329fdf6 100644 --- a/media-libs/ftgl/Manifest +++ b/media-libs/ftgl/Manifest @@ -1,6 +1,21 @@ -MD5 32426b3eee8a7652a5adb74a43a93620 ChangeLog 880 -MD5 8eaa4dd3ded9c106beea0a262f270f69 ftgl-2.1.2-r1.ebuild 1207 -MD5 613e2395bb6b970f07a5cdeca30de753 ftgl-2.1.2.ebuild 1082 +MD5 11a1e581e59a80a085d250f2600901ab ChangeLog 1042 +RMD160 39ce5677e1f44aee2a002c764877d64e345fd3ea ChangeLog 1042 +SHA256 cf05e7657e953f22d79505044246eb49379c13b488fa18a3c3fc487da3c7f95b ChangeLog 1042 MD5 8c117c40c473625c657ecb59b535caa1 files/2.1.2-ftgl.pc.in.patch 334 +RMD160 7adc21f49591fce7f5ec8224aa359ed1fe470f3e files/2.1.2-ftgl.pc.in.patch 334 +SHA256 fc5e76c57bf97204f0b3550f9ffa637bbdd11b7b140c887b5a156af8514d80b9 files/2.1.2-ftgl.pc.in.patch 334 MD5 2c668ede6711942506740cffd25b1245 files/digest-ftgl-2.1.2 62 +RMD160 6f54adae65641e5178947e94fec1e557108d89e9 files/digest-ftgl-2.1.2 62 +SHA256 50b31f32a54c0981160897380658634019952863bca7e7cc8dc183f1f3d12505 files/digest-ftgl-2.1.2 62 MD5 2c668ede6711942506740cffd25b1245 files/digest-ftgl-2.1.2-r1 62 +RMD160 6f54adae65641e5178947e94fec1e557108d89e9 files/digest-ftgl-2.1.2-r1 62 +SHA256 50b31f32a54c0981160897380658634019952863bca7e7cc8dc183f1f3d12505 files/digest-ftgl-2.1.2-r1 62 +MD5 522cd2e1e818d657e3e56f2ad3ab67c9 files/ftgl-2.1.2-gcc41.patch 524 +RMD160 25bd6585949085275d94c102fe65beaa3576dbc8 files/ftgl-2.1.2-gcc41.patch 524 +SHA256 a3a550f02e8db6cb8a66071f67493f1fc3f57188a98a33797f37b81a1322ec13 files/ftgl-2.1.2-gcc41.patch 524 +MD5 6a57c9d597c5da9088ceb9bffa0a304c ftgl-2.1.2-r1.ebuild 1254 +RMD160 f6453cda14618f04ed74945076da3cc34190e26e ftgl-2.1.2-r1.ebuild 1254 +SHA256 b7871a78d97317d8abd555bb6c212cb8a0cae8ddc7bc201cca16fca0ca07b844 ftgl-2.1.2-r1.ebuild 1254 +MD5 613e2395bb6b970f07a5cdeca30de753 ftgl-2.1.2.ebuild 1082 +RMD160 f9bcd0a0c347d719dd7d7d635d1e99f89d0945e1 ftgl-2.1.2.ebuild 1082 +SHA256 57c313934008045feb642f36a72d9ad602c3307f691a592309ec26dc66382621 ftgl-2.1.2.ebuild 1082 diff --git a/media-libs/ftgl/files/ftgl-2.1.2-gcc41.patch b/media-libs/ftgl/files/ftgl-2.1.2-gcc41.patch new file mode 100644 index 000000000000..c23aaacaf0a4 --- /dev/null +++ b/media-libs/ftgl/files/ftgl-2.1.2-gcc41.patch @@ -0,0 +1,11 @@ +--- FTGL/include/FTTextureGlyph.h.old 2006-01-29 11:08:54.000000000 -0700 ++++ FTGL/include/FTTextureGlyph.h 2006-01-29 11:09:06.000000000 -0700 +@@ -52,7 +52,7 @@ + * Reset the currently active texture to zero to get into a known state before + * drawing a string. This is to get round possible threading issues. + */ +- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;} ++ static void ResetActiveTexture(){ activeTextureID = 0;} + + private: + /** diff --git a/media-libs/ftgl/ftgl-2.1.2-r1.ebuild b/media-libs/ftgl/ftgl-2.1.2-r1.ebuild index 267a58f0e54d..64086871befc 100644 --- a/media-libs/ftgl/ftgl-2.1.2-r1.ebuild +++ b/media-libs/ftgl/ftgl-2.1.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.2-r1.ebuild,v 1.2 2005/12/10 21:13:49 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.2-r1.ebuild,v 1.3 2006/02/02 02:31:03 joshuabaergen Exp $ inherit eutils libtool @@ -25,6 +25,7 @@ src_unpack() { # Use the correct includedir for pkg-config epatch "${FILESDIR}/${PV}-ftgl.pc.in.patch" + epatch "${FILESDIR}/${P}-gcc41.patch" if ! has_version app-doc/doxygen; then cd FTGL/docs tar xzf html.tar.gz || die "unpack html.tar.gz" |