diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/swt/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/swt/Manifest | 19 | ||||
| -rw-r--r-- | dev-java/swt/swt-4.2-r1.ebuild | 174 |
3 files changed, 192 insertions, 11 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index b4e1a024fe94..b2689e98492d 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/swt -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.144 2012/07/09 18:33:43 sera Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.145 2013/05/10 15:44:28 tomwij Exp $ + +*swt-4.2-r1 (10 May 2013) + + 10 May 2013; Tom Wijsman <TomWij@gentoo.org> +swt-4.2-r1.ebuild: + EAPI 5. Revision bump, depend on glib-2.32 and remove deprecated g_thread_init + call. Fixes bug #461784. *swt-4.2 (09 Jul 2012) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 4843455e3db3..9b9b0a65bfd5 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX as-needed-and-flag-fixes-3.6.patch 7755 SHA256 4a33ab3b2f617d137977562b096c64a37600e48ceaee5e1f94f4c912efdcaaa3 SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083 WHIRLPOOL 05cc1a58c1647dba3f3b6985ffd503f8b2af74fd6e07d6ee76afcb7d16b8279dcd9a89097c4c70f1f1569065a62ca1255c551b371c74d0f095f60eac98cf8a7c AUX as-needed-and-flag-fixes.patch 7229 SHA256 016a810cc9649235fcab73467a056240b712d5557663b7756d4de64c939256ee SHA512 1c4d217965bd8ee9a293095dcf8abca399277a103e523610340a6f3cc25291cc53c2e89b9fed396298e5f9e7b78221df5c4bc881d65713058f029810799f8010 WHIRLPOOL c2abc3a0dfb593f8f3ab2d2f2427cc6c817367ec0c73108dff238e1110bde39c6d98b5e0adeede7d89c9296f227970db17e23893318b60f2becfb352837a69ef @@ -36,17 +36,18 @@ EBUILD swt-3.5.2.ebuild 4766 SHA256 f9b0cabc4f2cd251e83d3ee092cf55e6fe4efa251b10 EBUILD swt-3.6.1.ebuild 4774 SHA256 2fa22bec72c95340565d8ae982a28ab646acf7d512ac42f724b2b034409808af SHA512 2f2a9433ee392a367324be0c56900fe89f3723e0095477fefb0e5a67fa806deeaafea72b1d7cfc9c850332ee5a7874d540d5b55b0556e3864d12729f201872d2 WHIRLPOOL ecb6e924a581d0652eac5d4dbee1ccebfa762182782d744d2f394782e46932704724cf27c7b67e0ff2c0057d353ebb3d139ee8393bf75c356a1a0fd37ee15aa5 EBUILD swt-3.7.1.ebuild 4782 SHA256 f31f5bf1b5648d2d9b84961bc8dc9c7344f31b1a4f9526c8d60848641ac5881e SHA512 4f4224d34b3d4e1f64c4bae3c10b5721e4bee7b9c4f7ed7d5d117d1aa872b22fa833447b08ee321d80aafc35b54c310e362c63604d760a76a55133f943a07812 WHIRLPOOL c30705aa922aed6e12b9c57ee70902ceb89b5b3e2127730eea0ffd2b84743fec49000b482117c06b969c6452d81570611ca0a0d1dedd18b223ce3fe067c7f226 EBUILD swt-3.7.2.ebuild 4780 SHA256 8116026fb485ab02e4b389507bc47b42288657c96fff3b70dac3126a3409b77c SHA512 62ccbd7e73e5b5e6de22381de73f02f1b43641423f1d5b8738031cba97b159c438d6c22744c117b707dc6e1f78cd03a881e6f693ac12a2e89ce68406dc2e8f4a WHIRLPOOL d87b37a92db73240703191d204db6f75118d5a69c8b044ae3b91df38d49b7a803f3bb2dc5ef81cef021a3580982c1860dc00cdb5204b94a0f240b61f989f3a12 +EBUILD swt-4.2-r1.ebuild 4824 SHA256 1a0f97eca60d3a2791aca24573601fa7a23de0b56ae292a56e3f390ccf15c6fd SHA512 198ab0114ed9e7801c57cce950fcfe0a77fb1112dd2ea935964443395c861e597bf274022a70b1d951b68c2088ab95ac1fc64ebe935b14eb0fb0d4a18fad00cb WHIRLPOOL b995326f94a156f015298c7732df076906b31094f40dd841e7940d9c331792cc12018c31ca5cf0550b32f0279031c8db6d0dc411a681279cf5db8e057d0fc030 EBUILD swt-4.2.ebuild 4710 SHA256 6885c522f436c3a9a305c4bb19fda4bc5ffc10a248b670f7ff7a9d1acdcdac38 SHA512 6a60a8216de7d3106abeb3e673b9bc458ec6d39e6ae57a46870e326d2000984dd2f059e112b499a252baefe3dc71711a0e3e2121e3a707003a6c5202081e1d34 WHIRLPOOL d5afcaebc5b297fc7c0dfd4c3c7d35e6d1842e870758907ff5be295aa5c8c8d8f9acf8fbadedbc9a592857131b801277c7e79ec3f3fc4e9487e145a7ee237687 -MISC ChangeLog 24628 SHA256 0029c181f133bf687a98194763668424846ba8a03d9665bd64c55b615f8b15f7 SHA512 749f6eef3151d6fbd3018a4d775a9b109724a99013da6d40a670ecdcd8bb2dba162aab09f342d5fe65a1b2d3a70b9479f2b2c6e1220b51d152c9f5ee9e0beee3 WHIRLPOOL 4c18d346162fbf7b6e67ab5ece62ea670d0e369bc7f0c79bf2ea1e954d834dbbfe8eb01bbaa16f904fccc7cab7c83e4dbf6c5f0c491e6baa779ba8012543bf73 +MISC ChangeLog 24833 SHA256 ae7845c562a03be698aef028e2f171ec035ca872041369a0c00c1aa99c3cb4fc SHA512 befae2fea10685a76692dddc4b143e507e64be8e56e6c94b857f852d7609b21debe9f856a06afb0906554face36bb10068526347d4bd5c7712bdcd6bdac4344a WHIRLPOOL 8d25621f1e6163d78f8ec6b3c73cecb115d2c61868e1a44930f611bb9f9eccb42977916b1eeed68c3c8f763b4f12cb6764b85a939e351e9be1e0305e7e6d1822 MISC metadata.xml 578 SHA256 1e4845acfd81dc03aba0b504ac5c3307bf8d8a3bf666ece773fc483e458eaea0 SHA512 2b9ed1965582b5cd8371b473a296d620005273c82b393f5f32c3c45ce65926330bb75e4a312256c21bdb3f69a9c2a4b99f18e9396a349ba17ba94ebe647e5b8a WHIRLPOOL a32177b01a02581a0b4762e31cdf8029a88fc7e57ec9809c9a8156326a843e604a861e8f5f7bb44d8adc9e1c0c09eebb58d8d6ffd613ae531f99d6f1113cf044 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJP+yQZAAoJEIUJ+svaV163bP8H/0rkCV/rx2/+aP1JNCKc41NA -fBWxwA/JTEu9qRcbXgTq1P+/QyJ5x5CizcDh4cr3ymYDF6l4Om55HdM2tqc4y+5B -Ux8GVEjE5PvByU41qCbsVTRRgm7uq3nH8/i3NP2wPY5yF3JYTw/+E+QoXTVarvkN -Fr/TwYkF+GLC9CahySZON1BTkn1SoX5Gp6jMcrvR8RueEoM0Jk++ZwrQcoY1Dwy5 -OTq5gZsJkFe9xu92HX8bm9kFP7M/ZTzyXok+A0KGRBVMa+fBwjFBg8CpJomkZ7A4 -q4OT1dr1uKKrvojcpyNT3th69OIvLcOgmtrdltsZ5EPbrzjDHLN/GCcOWvNtle8= -=s56h +iQEcBAEBCAAGBQJRjRV/AAoJEJWyH81tNOV9NuwIAKHcFhRKiNytwKuBw1JqW03S +agltAFOyZNxPZLGyKwKMjAXfH6uC/UWNEtN5cp63ZK4VgDan/OQNp/E3ab5Ucv+o +RhrC509pYoHw49dlXap0OV2mD0Q3gbTsuRuVhk+Pd1paGmq5dm2weBKzQOn8VB/0 +pzBCMiIbM3/09GyBPGn9WKqWpL22hoTvy90LxR3tYqX55lIp6q2AYGmF0aVaCkmn +/56F5jm2ZlVv7lKD6ATa3QJY/z62FhZCSY1INOFVhIVoa0oRec24+DVSE9gvqS43 +sWbg4gM3ZSU1D1tr4a59apewZyLKLPbZlTkZIP/PPyfR94i42QLMSPJCfQKj7P4= +=cRyY -----END PGP SIGNATURE----- diff --git a/dev-java/swt/swt-4.2-r1.ebuild b/dev-java/swt/swt-4.2-r1.ebuild new file mode 100644 index 000000000000..9e2acdec4e1f --- /dev/null +++ b/dev-java/swt/swt-4.2-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-4.2-r1.ebuild,v 1.1 2013/05/10 15:44:28 tomwij Exp $ + +EAPI="5" + +inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip ) + x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) + x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="cairo gnome opengl webkit" + +COMMON_DEP=" + >=dev-libs/atk-1.10.2 + >=dev-libs/glib-2.32 + >=x11-libs/gtk+-2.6.8:2 + x11-libs/libXtst + cairo? ( >=x11-libs/cairo-1.4.14 ) + gnome? ( + =gnome-base/gnome-vfs-2* + =gnome-base/libgnome-2* + =gnome-base/libgnomeui-2* + ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( >=net-libs/webkit-gtk-1.2:2 )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.4 + app-arch/unzip + virtual/pkgconfig + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0 + x11-proto/inputproto" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.4" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME="usr/$(get_libdir)/libswt-.*.so" + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +java_prepare() { + # Replace the build.xml to allow compilation without Eclipse tasks + cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" + mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" + + # Fix Makefiles to respect flags and work with --as-needed + epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch +} + +src_compile() { + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + local AWT_ARCH + local JAWTSO="libjawt.so" + if [[ $(tc-arch) == 'x86' ]] ; then + AWT_ARCH="i386" + elif [[ $(tc-arch) == 'ppc' ]] ; then + AWT_ARCH="ppc" + elif [[ $(tc-arch) == 'ppc64' ]] ; then + AWT_ARCH="ppc64" + else + AWT_ARCH="amd64" + fi + if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" + elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" + elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then + export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" + else + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 + + local platform="linux" + + use elibc_FreeBSD && platform="freebsd" + + # Bug #461784, g_thread_init is deprecated since glib-2.32. + append-cflags -DNO__1g_1thread_1init + + local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + ${make} make_awt + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use gnome ; then + einfo "Building GNOME VFS support" + ${make} make_gnome + fi + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building the WebKitGTK+ component" + + ${make} make_webkit + fi + + einfo "Building JNI libraries" + eant compile + + einfo "Copying missing files" + cp -i "${S}/version.txt" "${S}/build/version.txt" + cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ + "${S}/build/org/eclipse/swt/internal/" || die + + einfo "Packing JNI libraries" + eant jar +} + +src_install() { + swtArch=${ARCH} + use amd64 && swtArch=x86_64 + use x86-fbsd && swtArch=x86 + + sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die + use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF" + use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" + use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF" + use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" + java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" + + java-pkg_sointo /usr/$(get_libdir) + java-pkg_doso *.so + + dohtml about.html +} |