diff options
author | Tom Wijsman <tomwij@gentoo.org> | 2014-04-27 14:18:34 +0000 |
---|---|---|
committer | Tom Wijsman <tomwij@gentoo.org> | 2014-04-27 14:18:34 +0000 |
commit | c4d2e9a6ca816d755f47b67655bfca36832e2229 (patch) | |
tree | 56f02e7ae19e298ca52b615eac48f7886392e980 /dev-java | |
parent | Removal (bug #501432). (diff) | |
download | historical-c4d2e9a6ca816d755f47b67655bfca36832e2229.tar.gz historical-c4d2e9a6ca816d755f47b67655bfca36832e2229.tar.bz2 historical-c4d2e9a6ca816d755f47b67655bfca36832e2229.zip |
Make gnu-classpath support freetype 2.5.3; fixes bug #504944, reported and patch contributed by darkbasic.
Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/gnu-classpath/ChangeLog | 10 | ||||
-rw-r--r-- | dev-java/gnu-classpath/Manifest | 29 | ||||
-rw-r--r-- | dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch | 32 | ||||
-rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild | 8 |
4 files changed, 57 insertions, 22 deletions
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index 4b9cab4b2592..77045a68f0fa 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/gnu-classpath -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.119 2013/03/02 19:55:16 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.120 2014/04/27 14:18:30 tomwij Exp $ + + 27 Apr 2014; Tom Wijsman <TomWij@gentoo.org> + +files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch, + gnu-classpath-0.98-r3.ebuild, metadata.xml: + Make gnu-classpath support freetype 2.5.3; fixes bug #504944, reported and + patch contributed by darkbasic. 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> gnu-classpath-0.98-r3.ebuild: diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest index 79469587dc85..55021c08901a 100644 --- a/dev-java/gnu-classpath/Manifest +++ b/dev-java/gnu-classpath/Manifest @@ -1,26 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX gnu-classpath-0.98-r3-freetype-2.5.3-support.patch 1192 SHA256 6c37e672e9994fdc1173da54ff76ab62799ae1f109783a4829a7393b58072baf SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb WHIRLPOOL 8af4adc984cb914853a91ca9ffe4c863fa29de6a72cff11c9c8e851453fa90263d4fe460e0ea857c36649fbeb04c7017d3ccad1a80f4443b0d2dd6b5fa5360b9 DIST classpath-0.98.tar.gz 11021342 SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f WHIRLPOOL 1248288af3821fedae226852da41b1a176e0c03f83f95b7e7a123655e3b588f4b1716274aebd1b728b11a63e35c820994bce0293b4bed6ea8837dabb0bf90c7e -EBUILD gnu-classpath-0.98-r3.ebuild 3304 SHA256 de4ed55d53359f663400db79cee7e7d1ac4bb7b4ffd7393727b10c2670992080 SHA512 65220d009b1719c03d6da166d698273985eba2eda405b90f37a403832a7c306802b020a7c1ab1e5247211378f0ca93fbc69561291b30d93c64c26ff44bf609ff WHIRLPOOL 3ad3290fa82a80d11444946dca08e3430431bbbc30b2ae441a3ca2de18fa6868985c5e7fab267d33ed9fb635a8a2b53a7752540393b2515205800360335a84d3 -MISC ChangeLog 18326 SHA256 645173797d7da235236e11b73ca2055b87d3b6b387914823286ce8130f422b23 SHA512 06db1cfa545f66841935712c18ebbd074fd484e98171f3b90a1c6580094071307a05f71df7cb7dbe8e8cd46b9a32c7c7fcdab48525a37193c0c1b9c5e08f3cea WHIRLPOOL c2b7513be9ce5388dcb7e0ba793f909a82d87392b294177e98cd2c583df85e42c920a7fbc40d4a66f74e7c22988305b99481727466e3cdfdcdc8fae4e1d36826 +EBUILD gnu-classpath-0.98-r3.ebuild 3380 SHA256 27c6d473b478f5ff45592f16614fc2995c743faedd9ae6239af4ba1080099ec5 SHA512 064e5bcfe53e8bf6dc73ac23460c4537fc54a1d097b7ff293f5d153def75177a6780c4f06804da2b6a7a497147f69c51e96952d1fc153744852a2f37da47095c WHIRLPOOL bcacb2b48ed808ba772d0841042ad344bc0e5a3cce5f5016c6234a47bd39dc81ee9a12b6c9a133368ae01bd62451e32ce7835b4edd996728b086ff4e54042a62 +MISC ChangeLog 18590 SHA256 aa74d026db65f57f1a010eac281e0dc2891de9d7d314d19a7697157dcc720f4a SHA512 5cac0f154c744fe8b928d30ea64f86000009c42571979c6512539a7e35ee42c8d08ea0a629b262f3d2c465f65e2234bca7d9b085ac06e2a849dcee230f5d8666 WHIRLPOOL 9dc640f5e4c95ef496f45c7a8e45dc15ded18793d6851bf2f2dd1cc56afc66792e1f7377d697afc3d45994607712670214a239bf214577856891a3bc6acc0b2b MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJRMlkjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88WNwQAJoTClCR9mDBGegteXBekYRM -ltlHRtGYyOxLQwPk6EBE6Tee6Z2UiGqBtcSo+I4gDmGMKIYEmhLUJiBi3MrVxmAK -Qn/exKJpsc4Q8v+ajOt7iXZMMp9zsiFNTAAXQ4NhUaP5ICx0SP0MEjweGPK/S5eO -gyw0POUn/v5+Pf8HmbXGIMnLexyzwlaLVwtPgN9ypkPpgwtcwp93WiKjbrK4v42/ -clIw1c/mVhi2i+pWD7MnzdGaj6C1gia6+irXLiaTF9QWGsN2W2+9Sd3Z5LsJQNnC -zpyjk3Ysi+z6Tk5Pd/A6yNJO6KT/GFIN5uh4WExxr7ow5qIxwnJuZmLTrVKvhT6l -tMrCLVwW8Az5y1SRhMV97b/MDPYpcSMUZ+EQIt5kbW9NPviAcQEBybx/5TplBbex -cRh6Y18EIbpuGv48hWVYzYTfjJcmBcOA9VmDerpFqmWmgDc22kh6GNiSzx7nqvAw -sgVhYGUlRKDMx+cZplKoi+yCkFwf/PDOOUrnD5jn7kFVe72FUfTzPx1+NZBlwheK -47J8DtdMIU6ex6samZ+PWq4mCiEMMfZZ966kPSvbfDFaOAdIx7x+cBmF5PDjsWPA -wKraK6dcN53CWbSQO8xqFwOeHjXaedplyVMoflVwg+KGctuxAxFW1I2a1KkWpjwz -ICkSZyFvoq+uKJCBCSo8 -=H9br +iQEbBAEBCAAGBQJTXRFyAAoJEJWyH81tNOV9IwsH+IIoxkKjTZKhlEECh7dnGqII +ftgURnEWxVkkgFbIlWccAbw0w0WipVHLO3yrooBIKM395pFURSUukRGNFNEx67RY +ZRDBbNmtDxd/zHjSz0yduiA7esknKbYcLrMAeC0lg9bYKuw0rQmeauWF08H0M/ho +uuhHEsLkY7WGLkHDTKXPpv+KbnLbVeAgdj8T+tAvXzNbSwUxUdXFGoncF/aeQtVX +2iEV6ciHx79OBwtaRmPXLRxrdme4Hz1+TnB7GQopdumrvyzhTbBcqs01v1kB5pna +ci8ecAg1nsiXvCZVM9vLwGBnwmFaNRu9sJFqx7kC5VB2IiEwanmjBNbVGbP4nQ== +=RiaA -----END PGP SIGNATURE----- diff --git a/dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch b/dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch new file mode 100644 index 000000000000..42828e2a4b8f --- /dev/null +++ b/dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch @@ -0,0 +1,32 @@ +--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig 2014-03-18 10:35:50.904133661 +0100 ++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-03-18 10:37:03.808131298 +0100 +@@ -42,8 +42,9 @@ + #include <pango/pango.h> + #include <pango/pangoft2.h> + #include <pango/pangofc-font.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_GLYPH_H ++#include FT_OUTLINE_H + #include "jcl.h" + #include "gdkfont.h" + #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" +--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig 2014-03-18 10:37:12.048131031 +0100 ++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2014-03-18 10:37:58.416129528 +0100 +@@ -39,10 +39,11 @@ + #include <pango/pango.h> + #include <pango/pangoft2.h> + #include <pango/pangofc-font.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> +-#include <freetype/fttypes.h> +-#include <freetype/tttables.h> ++#include <ft2build.h> ++#include FT_GLYPH_H ++#include FT_OUTLINE_H ++#include FT_TYPES_H ++#include FT_TRUETYPE_TABLES_H + #include "gdkfont.h" + #include "gtkpeer.h" + #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
\ No newline at end of file diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild index da37e3e2b6b0..2b39f00d3d01 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.9 2013/03/02 19:55:16 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.10 2014/04/27 14:18:30 tomwij Exp $ EAPI=4 @@ -63,6 +63,10 @@ RDEPEND=">=virtual/jre-1.5 S=${WORKDIR}/${MY_P} +java_prepare() { + epatch "${FILESDIR}"/${PF}-freetype-2.5.3-support.patch +} + src_configure() { # We require ecj anyway, so force it to avoid problems with bad versions of javac export JAVAC="${EPREFIX}/usr/bin/ecj" |