commit: 5c5dcb3de270653e9c3d29c854e9a00f6bf42f76 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Tue Jun 23 03:47:22 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Tue Jun 23 03:47:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5c5dcb3d
Fix build of GNU Classpath 0.99 and remove slotting as we no longer need to support multiple versions. Package-Manager: portage-2.2.17 Manifest-Sign-Key: 35964222 dev-java/gnu-classpath/ChangeLog | 11 ++- dev-java/gnu-classpath/Manifest | 24 ++--- dev-java/gnu-classpath/files/freetype.patch | 64 +++++++++++++ dev-java/gnu-classpath/files/pr55182.patch | 103 +++++++++++++++++++++ ...th-0.99.ebuild => gnu-classpath-0.99-r1.ebuild} | 22 +++-- 5 files changed, 196 insertions(+), 28 deletions(-) diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index 96eced6..24bd3a8 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for dev-java/gnu-classpath -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $ +*gnu-classpath-0.99-r1 (23 Jun 2015) + + 23 Jun 2015; Andrew John Hughes <[email protected]> + +files/freetype.patch, +files/pr55182.patch, +gnu-classpath-0.99-r1.ebuild, + -gnu-classpath-0.99.ebuild: + Fix build of GNU Classpath 0.99 and remove slotting as we no longer need to + support multiple versions. + 11 Mar 2013; Andrew John Hughes <[email protected]> gnu-classpath-0.99.ebuild, gnu-classpath-9999.ebuild: Fix Qt4 dependencies due to changes in main tree. @@ -506,4 +514,3 @@ 09 Mar 2004; Chris Aniszczyk <[email protected]> gnu-classpath-0.06.ebuild, metadata.xml: Initial Import. Closes #43926 - diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest index 179c454..1362f67 100644 --- a/dev-java/gnu-classpath/Manifest +++ b/dev-java/gnu-classpath/Manifest @@ -1,26 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX freetype.patch 2283 SHA256 fbd80c40b7568788cec3154550b203dfb08cc753c09e23e8e5a606b18d25e334 SHA512 b8b6b8dc1b98f961ecc172063d8bbd8a8c5404214d1cadcea0d84bddb1e304490af494fc5965b15a8663d1284e84b60310ca7c3122ca497bd088b468855022c6 WHIRLPOOL 6ccbd20e06403da706420f50b7c4ba776f5f85c78c2dd0bb5bf34f866bec4a9f7f3792624e33f0eb24d6b190aa853facd2bed2ad85b95e7d06b638f221c38a23 AUX gjdoc_support.patch 384 SHA256 556d8372fefd8dcec1ab0cf497fa29f106341dbf94d5550633a1344baf462fd1 SHA512 cc0758018e5925cd4ef0897acd26db50f4cca35cb70619fe778f63db70be3e2e2b1e03de5f36d5f7f36474aefb07c0804b5e90c57d98882f195d82968fc0e38b WHIRLPOOL 144b11cca9b1e29d13feb45e7f37a7eae93103274c429e1626f1d03b1d87e67001fce81813c3a4521c9fc116ac2687c81d683d32b254e9e3a808ecc8a35d104b +AUX pr55182.patch 3343 SHA256 b36a90086ba70402848339f9d0cdaa9c173d45b8bf9abae39e33ad8bede3b718 SHA512 b38a1e8618afea1243f604acc479a13a4d8abe5c3c6bdab651480fddcabbcaa3a5684a8e66a4f7c7b1d1bafb2637bd1b7a6675d2c17842970c8642b0167188ed WHIRLPOOL 96c98aa4c01740bb10593157206d1e3126a6cb02efd2a61e7639bc266b53791ba30e442f27e277130881df381347f6626ad522a8e504ad2aa3e56a746f52f436 DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af -EBUILD gnu-classpath-0.99.ebuild 3585 SHA256 3a9bccb764d9e9e87c1ab79b6abafd686cd3610223a41f9984819c477dcbbd9c SHA512 f758bc1d9d44aa404e017550ddbbc3bfa81d0cf2f6204f06ef660a34aef6d33ab86b0a8c18957ad637d1d07d2cabc1fd449d63bdc97eb007dda56bf363a447cc WHIRLPOOL e822d136509c57bef0e73f893cfee40afc0a6fef035dc1b1b5d67722d019e8e753c10a5fb3a08816069fdc4d64dd9a1021c1b84e8756a9b64c4b0688704a2553 +EBUILD gnu-classpath-0.99-r1.ebuild 3732 SHA256 4b75ed035188182853a8b2a2e1cb4689cda3e4d29da88d8c0a7c1d4578b0d2d9 SHA512 116d4e769a207b94cdfe2f2766779bad72c47cccb3dcefa459f61aa47d3f9caa4e72bff129eeeffe6a4d7df27ed873e19b8af6db0c3b61dbd9833729287e2c71 WHIRLPOOL efcf6c7574f8d6c1e20e817e55a377aa0251a9fce2e0e95e5ab23b493f5b4b08645945ec363192fb18252180d0d2f97e691f618b3db31855caefe1fb08928608 EBUILD gnu-classpath-9999.ebuild 3590 SHA256 2a97612fde4944767d4bdb42350aabcb8bdb60b2610c0942a3aee2f02cef928b SHA512 d6ee0bb21f6f1d112a8b9fbbaf846c2820ddf7d21f7eb85ea2d03119381cb037c2c0eccd4c1d66bcadc904c28bb97ca28feefc6933a560356cd8dc9511e26b6f WHIRLPOOL 055d3709017ef1636d91d5d8b9339dcda85c9696d4076ab05f23702bde4022d88b633c400a210886fcac079dbdc5e8885530e91b51846ca176f7c0e08259d142 -MISC ChangeLog 18239 SHA256 4113048f8f92c6fe5f0bda80f9a92598fc5ed73eb558e5c624e0852dabeacd87 SHA512 e2b243d93087933f8b0b78567e90ac32a26ee08cad2e7e455e5def79c84054ec05ee485e283f047f005d2d7b56d5c697e22bb310e36b6e4797cd5cf021657321 WHIRLPOOL 5999d5621043636850656d2d5a1345a494ed76c6007bdd71fb9b607f5751b4f5dbe15d2528824655a09ff28d58b5827418b6db53c4f7bf78c70c0b9e124b6ea7 +MISC ChangeLog 18554 SHA256 f27029504b95bea6b64dc92c423954213c98d370bc8581138b6f49c046d278c0 SHA512 84cd885715d0add3d013366461655878795a80470c8992a33313fddbc41256b4b8b74896485ea23b1445689e39d69f31fb89346ccdbfb49aad60b0e3fa273dda WHIRLPOOL 76597b0fee6235624ab52f9d6451b68d9d1bfbc4a1c4318af347dbd016ee02e3fa4a27a262d2a7823e9a5ec03773f2a0a61228245b61e743efd78ffd91da486d MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCAAGBQJRShFuAAoJEDuWpXgki9wHS44P/i2+l1nduzMdrGNfwXj8OQ6n -azZ3CJ9LeXloN/kIN5+4HBJKdQBOnC6MNYReTKh5kMVqHoLQvZNOppyH+OHh4E9S -alsFoK3KbV7VH4YnOcA8tNr2yC7nKdkaOpdfImUj902GftFbuU/owCsKBaNuQunl -sGkk2L99VlnbiFntcAlOD6AQNm1dbHwNICOlxBAyIvGtl8pfrr17FgJl5Vq7Fsdl -RKm4PmTY81//OTUmXhbjOaJu0K0BH3MQgmoXzPOmcIE5eYbA7JZh7mVlD22OAe/k -YViPyKsUjhTtEnGIa+/LE3xmnRbhr/ziyGkqhYvQbCye7ctTwGWZQiko0F2hmT+c -e+cu1nGhDUa+K6MzYDGQB7IZWfhRcmJZzlivlY3MF5h7DNUhG2zATNHmYa3OjiJP -R4X/9jcv1LA7tD2AalkUu49hJjAIG3esV7CnObLwyEKCWuCrhnvS+f8eFiKOz7A1 -UT7rj+FabB0pPTVCc8sM05pwJLkpnIaW8ZFZDphAGZcpkmJqqtMAj+xYkZW5aXI1 -VkhcP/GJoNb8NHvcPQ9SIKR8Dqgq+ij5w7PCdKVwMcfbfVG316jSE2bqupdChCHp -mmmR3V2xKuJmdNMu5h+tNAnVLpNoWHTIp265MRAPIdWGSsC/gjIyRJXmRsmAxpn9 -zKQ0DTNkYn1eejn/p4JU -=ST1A +iF4EARYIAAYFAlWI1r8ACgkQz9oPmzWWQiLaqgEA1ygX/tw91aY99iwHZX9kr29X +G/ysJQ3slwFTjbvf7z0A/AiA9RFX/AEjXnZZzqtSCTEnkKCaxXMhQhbHl6xaLc4D +=4xq6 -----END PGP SIGNATURE----- diff --git a/dev-java/gnu-classpath/files/freetype.patch b/dev-java/gnu-classpath/files/freetype.patch new file mode 100644 index 0000000..4ed7a64 --- /dev/null +++ b/dev-java/gnu-classpath/files/freetype.patch @@ -0,0 +1,64 @@ +commit 51e45beeb3755bca44d21ef38433013cd41b4017 +Author: Andrew John Hughes <[email protected]> +Date: Wed Apr 30 21:39:16 2014 +0100 + + Use correct inclusion method, allowing builds with FreeType >=2.5.3. + + 2014-04-20 Andrew John Hughes <[email protected]> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c: + Use correct inclusion method, allowing builds with >=2.5.3. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: + Likewise. + + Signed-off-by: Andrew John Hughes <[email protected]> + +diff --git a/ChangeLog b/ChangeLog +index 4548c1d..e5879eb 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++2014-04-20 Andrew John Hughes <[email protected]> ++ ++ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c: ++ Use correct inclusion method, allowing builds with >=2.5.3. ++ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: ++ Likewise. ++ + 2012-11-02 Andrew John Hughes <[email protected]> + + PR classpath/55182 +--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c ++++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c +@@ -42,8 +42,9 @@ exception statement from your version. */ + #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" +diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +index 771b23e..cfd988c 100644 +--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c ++++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +@@ -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" diff --git a/dev-java/gnu-classpath/files/pr55182.patch b/dev-java/gnu-classpath/files/pr55182.patch new file mode 100644 index 0000000..16b8b11 --- /dev/null +++ b/dev-java/gnu-classpath/files/pr55182.patch @@ -0,0 +1,103 @@ +commit c814d82e5a435f93150cd28b7cf0f9d600ff400d +Author: Andrew John Hughes <[email protected]> +Date: Fri Nov 2 18:08:52 2012 +0000 + + PR55182: Fix build on RHEL6 + + 2012-11-02 Andrew John Hughes <[email protected]> + + PR classpath/55182 + * configure.ac: + Lower required version to support autoconf + on RHEL6. Make disabling Werror the default. + If a Qt4-specific moc is detected, use it + rather than the default. + * doc/Makefile.am: + Generate texi2dvi output in the build directory + and explicitly specify POSIX locale to work around + Debian bug 586134. + (clean-local): Remove output from texi2dvi. + + Signed-off-by: Andrew Hughes <[email protected]> + +diff --git a/ChangeLog b/ChangeLog +index 03acce8..a88ea4f 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,17 @@ ++2012-11-02 Andrew John Hughes <[email protected]> ++ ++ PR classpath/55182 ++ * configure.ac: ++ Lower required version to support autoconf ++ on RHEL6. Make disabling Werror the default. ++ If a Qt4-specific moc is detected, use it ++ rather than the default. ++ * doc/Makefile.am: ++ Generate texi2dvi output in the build directory ++ and explicitly specify POSIX locale to work around ++ Debian bug 586134. ++ (clean-local): Remove output from texi2dvi. ++ + 2012-03-08 Andrew John Hughes <[email protected]> + + * NEWS: Set correct release date. +diff --git a/configure.ac b/configure.ac +index bd48e84..b20a4bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -37,7 +37,7 @@ AC_SUBST(CLASSPATH_MODULE) + CLASSPATH_CONVENIENCE="-no-undefined" + AC_SUBST(CLASSPATH_CONVENIENCE) + +-AC_PREREQ(2.65) ++AC_PREREQ(2.63) + AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) +@@ -143,9 +143,9 @@ AC_ARG_ENABLE([Werror], + [case "${enableval}" in + yes) ENABLE_WERROR=yes ;; + no) ENABLE_WERROR=no ;; +- *) ENABLE_WERROR=default ;; ++ *) ENABLE_WERROR=no ;; + esac], +- [ENABLE_WERROR=default]) ++ [ENABLE_WERROR=no]) + + dnl ----------------------------------------------------------- + dnl Default AWT toolkit +@@ -654,7 +654,11 @@ if test "x${COMPILE_JNI}" = xyes; then + QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR", + AC_MSG_WARN([QWidget not found]))) + AC_CHECK_PROG(MOC, [moc], [moc]) +- AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4]) ++ AC_CHECK_PROG(MOC4, [moc-qt4], [moc-qt4]) ++ if test x"$MOC4" != x ; then ++ AC_MSG_NOTICE([Using $MOC4 as moc]) ++ MOC=$MOC4; ++ fi + fi + if test "x$HAVE_QT4" = "xno"; then + AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config]) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 5ff03f0..eefbd3a 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -4,8 +4,9 @@ EXTRA_DIST = README.jaxp texi2pod.pl + + info_TEXINFOS = cp-hacking.texinfo cp-vmintegration.texinfo cp-tools.texinfo + ++# POSIX locale necessary to make grep work; see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586134 + .texinfo.dvi: +- texi2dvi $< ++ LC_ALL=POSIX texi2dvi --build-dir=$(builddir) -o $@ $< + + .dvi.ps: + dvips -o $@ $< +@@ -87,3 +88,5 @@ gjdoc.pod: $(srcdir)/cp-tools.texinfo + + CLEANFILES = $(TOOLS_MANFILES) + ++clean-local: ++ -rm -rf *.t2d diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild similarity index 85% rename from dev-java/gnu-classpath/gnu-classpath-0.99.ebuild rename to dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild index 854c203..06d852d 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.99.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 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.6 2011/03/29 09:13:40 caster Exp $ @@ -12,10 +12,10 @@ SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/classpath"; LICENSE="GPL-2-with-linking-exception" -SLOT="0.99" +SLOT="0" KEYWORDS="~amd64" -IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml" +IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml" RDEPEND="alsa? ( media-libs/alsa-lib ) doc? ( || ( >=dev-java/gjdoc-0.7.9-r2 >=dev-java/gnu-classpath-0.98 ) ) @@ -64,7 +64,12 @@ RDEPEND=">=virtual/jre-1.5 S=${WORKDIR}/${MY_P} src_prepare() { + # Adds support for building with the version of gjdoc in GNU Classpath epatch "${FILESDIR}/gjdoc_support.patch" + # Fix a number of build issues, including turning Werror off by default + epatch "${FILESDIR}/pr55182.patch" + # Fix Gtk+ peer code to work with modern Freetype + epatch "${FILESDIR}/freetype.patch" autoreconf } @@ -80,8 +85,6 @@ src_configure() { # this will make the ecj launcher do it (seen case where default was not enough heap) export gjl_java_args="-Xmx768M" - # don't use econf, because it ends up putting things under /usr, which may - # collide with other slots of classpath local myconf if use gjdoc; then local antlr=$(java-pkg_getjar antlr antlr.jar) @@ -95,7 +98,7 @@ src_configure() { ecj_pkg="ecj-gcj" fi - ANTLR= ./configure \ + ANTLR= econf \ $(use_enable alsa) \ $(use_enable debug ) \ $(use_enable examples) \ @@ -111,15 +114,14 @@ src_configure() { --enable-jni \ --disable-dependency-tracking \ --disable-plugin \ - --host=${CHOST} \ - --prefix="${EPREFIX}"/usr/${PN}-${SLOT} \ + --includedir="${EPREFIX}"/usr/include/classpath \ --with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \ - --disable-Werror \ ${myconf} } src_install() { emake DESTDIR="${D}" install dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO - java-pkg_regjar /usr/${PN}-${SLOT}/share/classpath/glibj.zip + java-pkg_regjar /usr/share/classpath/glibj.zip + java-pkg_regjar /usr/share/classpath/tools.zip }
