diff options
| -rw-r--r-- | dev-java/swt/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/swt/Manifest | 22 | ||||
| -rw-r--r-- | dev-java/swt/files/digest-swt-3.3_rc4 | 9 | ||||
| -rw-r--r-- | dev-java/swt/files/swt-3.3_rc4-callback-pointer-dereferencing.patch | 23 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.3_rc4.ebuild | 216 |
5 files changed, 275 insertions, 5 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index 404273bd75a5..426729811eec 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/swt # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.67 2007/06/14 00:43:24 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.68 2007/06/18 10:26:49 caster Exp $ + +*swt-3.3_rc4 (18 Jun 2007) + + 18 Jun 2007; Vlastimil Babka <caster@gentoo.org> + +files/swt-3.3_rc4-callback-pointer-dereferencing.patch, + +swt-3.3_rc4.ebuild: + Version bump, adds firefox USE flag as it now works too, without need for + patchset. 14 Jun 2007; Christoph Mende <angelos@gentoo.org> swt-3.2.2.ebuild: Stable on amd64 wrt bug 179815 diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index a4c691191096..7c143f2f3082 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -22,6 +22,10 @@ AUX swt-3.2.1-fbsd.patch 2545 RMD160 c9dd690a2e5f892d7614bf7efc461ab3a4549e57 SH MD5 984379c24b33ef9a5acd963254a14fc0 files/swt-3.2.1-fbsd.patch 2545 RMD160 c9dd690a2e5f892d7614bf7efc461ab3a4549e57 files/swt-3.2.1-fbsd.patch 2545 SHA256 4a89bfb108a231997b65bf6b6eb3ad393d41801692e5586f60aa79e25385fe9f files/swt-3.2.1-fbsd.patch 2545 +AUX swt-3.3_rc4-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab +MD5 870ebea6385f5161df108d610214c519 files/swt-3.3_rc4-callback-pointer-dereferencing.patch 882 +RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea files/swt-3.3_rc4-callback-pointer-dereferencing.patch 882 +SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab files/swt-3.3_rc4-callback-pointer-dereferencing.patch 882 DIST swt-3.2-gtk-linux-ppc.zip 2913359 RMD160 558cddfbd3fb32091908c23a26db4f153bf36510 SHA1 b0fb2ce02983be18d6d9d7df033a168a1c92d2a3 SHA256 13cda631e4ec522c9d10aa2edb5a38f104e40ad1f67f94513f932a9193167062 DIST swt-3.2-gtk-linux-x86.zip 2935209 RMD160 d9560445852020e7d755594c60ba01c7904b9924 SHA1 1d6d0cd4624c93ae005053681731cbaf3d4a2e52 SHA256 05701ceb02a4099e035571abb0d005947758de48c47b49cd38a5b3fd5670a13c DIST swt-3.2-gtk-linux-x86_64.zip 2841135 RMD160 8764b1357a23a530c9e523b6f1364a7b7abfea01 SHA1 afd11534a90b2f547fb87c5cf6edea205c0a7d92 SHA256 fb00c97c488353a10d7842a50b9184851e90870c3ec1b0ee3bfa838e6ac9a665 @@ -33,6 +37,9 @@ DIST swt-3.2.2-gentoo-patches-r1.tar.bz2 7994 RMD160 4ca8206b35e35a98511e9bbd2bd DIST swt-3.2.2-gtk-linux-ppc.zip 3042753 RMD160 dbec93a4fa1f256a06ff856e5aba8a22a927a52a SHA1 910e09675a7c56bac48d5d34471e11326d57690a SHA256 e5a03729ee01c32950a2244e0d1b8159d988264bc1b335af1b926cba51155450 DIST swt-3.2.2-gtk-linux-x86.zip 3117432 RMD160 b99c00a6f43316cb82bd38f1e8bd92eea4006b78 SHA1 b29f656dffdb4e85867455e04ff71f4ceb24befe SHA256 aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28 DIST swt-3.2.2-gtk-linux-x86_64.zip 2996317 RMD160 81ca3cfa69ab084d9bbe04d8ac6a941c65b46b15 SHA1 0fea5ba09d2014d0eae13caf11cbcd445d6236d6 SHA256 a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56 +DIST swt-3.3RC4-gtk-linux-ppc.zip 4514325 RMD160 fd1494ff909781a4266390c711b72117096e0df8 SHA1 29021db401727a927f728f9334a20623ccba560a SHA256 89c3d3af00323bac47bf001b11c21b3b02b27d8c0f290cfbc7691de790ca01b7 +DIST swt-3.3RC4-gtk-linux-x86.zip 4448002 RMD160 1587f2a918de0ce5ee64055e43636982b9533e40 SHA1 78e1283482e0cfcf8a58e38588ea76d2e8017b7f SHA256 3ba284e1ff70e5c2895aafba9824e281bfdc5446ec733dd3eaf6f82fac26493e +DIST swt-3.3RC4-gtk-linux-x86_64.zip 4622486 RMD160 ca19c8e0a358860e5997b7e638ed59da604d8db4 SHA1 b250f5c37db444b768e073464cdc9168094aae73 SHA256 628d8ad5b1b58d2d3cfc177edcefa9794a449f2080807f982d04dda6b2b8796f EBUILD swt-3.2-r2.ebuild 5218 RMD160 9dc4c32896190346a3c3b17ef04a7dc3feaaf99c SHA1 b2e2cb368812cc9372d320dacac9cdf535ce8fb9 SHA256 857f4a07bd3db1bee1e4bd42750ad397b83450e003e01b910958823918154d71 MD5 007f7c7310c05aed03e39bc352913c19 swt-3.2-r2.ebuild 5218 RMD160 9dc4c32896190346a3c3b17ef04a7dc3feaaf99c swt-3.2-r2.ebuild 5218 @@ -49,10 +56,14 @@ EBUILD swt-3.2.2.ebuild 5548 RMD160 47dbaf6d2fb3981eebbbd953749a38589314186b SHA MD5 132250d3ff40245a41d27f886bd96bfb swt-3.2.2.ebuild 5548 RMD160 47dbaf6d2fb3981eebbbd953749a38589314186b swt-3.2.2.ebuild 5548 SHA256 1561478f5253ace175f5390e57a5222e0abd8d6d4706e306bb09a6b7cb7020ce swt-3.2.2.ebuild 5548 -MISC ChangeLog 11969 RMD160 f71e40c21867bb037fc4e81863d7058657529ef2 SHA1 88c76ba03df85d10835537ec46689e05eb1af666 SHA256 c809fff5b278b7b467496a3450945c1d00d2c4bab9297adc38aeb60862c90581 -MD5 03d12ae0f532005966f53811aa1711cd ChangeLog 11969 -RMD160 f71e40c21867bb037fc4e81863d7058657529ef2 ChangeLog 11969 -SHA256 c809fff5b278b7b467496a3450945c1d00d2c4bab9297adc38aeb60862c90581 ChangeLog 11969 +EBUILD swt-3.3_rc4.ebuild 6131 RMD160 5b32de58ab4d4c1d08239d902e843813e6dec112 SHA1 13b5f65a4f032f72db221dfc77f407dfa2355abd SHA256 5be2d2e7fb4bf34d9f827e7784d5784d39af6452de1a41efc70ae4f93d7c56c0 +MD5 77ed2e2436454acca99d5fbfa59b5689 swt-3.3_rc4.ebuild 6131 +RMD160 5b32de58ab4d4c1d08239d902e843813e6dec112 swt-3.3_rc4.ebuild 6131 +SHA256 5be2d2e7fb4bf34d9f827e7784d5784d39af6452de1a41efc70ae4f93d7c56c0 swt-3.3_rc4.ebuild 6131 +MISC ChangeLog 12218 RMD160 3102621592200c4fa4efa00a1b0f071eb2492352 SHA1 5bfe4fa658ef3beb911fac84ee76f312e2c03e3d SHA256 1abafe2b618ed67e4d94fafc4d47a42e755903ca40e625d2512390785370c63b +MD5 5fd6705350d73dd167d9e15afd85d4c9 ChangeLog 12218 +RMD160 3102621592200c4fa4efa00a1b0f071eb2492352 ChangeLog 12218 +SHA256 1abafe2b618ed67e4d94fafc4d47a42e755903ca40e625d2512390785370c63b ChangeLog 12218 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440 @@ -69,3 +80,6 @@ SHA256 b3fe8fd2e9c3adf8a4ebd937d1943b87fc843cef1ac16e8e13e4bf6a76624de6 files/di MD5 f1f7369bc842ab6e4dd5b32df60abadb files/digest-swt-3.2.2-r1 1084 RMD160 a6395c10d424d638b5318dcc61d10b5aadb6eb3c files/digest-swt-3.2.2-r1 1084 SHA256 b3fe8fd2e9c3adf8a4ebd937d1943b87fc843cef1ac16e8e13e4bf6a76624de6 files/digest-swt-3.2.2-r1 1084 +MD5 5d29d771cf22f442145b9c9a2d571aff files/digest-swt-3.3_rc4 813 +RMD160 a4c35b6efd2f7a003b4ed222e9c93b691a64c42b files/digest-swt-3.3_rc4 813 +SHA256 411a70fecb64a1b43245f8cb3e8580d9df87ed67fde601f3eb8be56b6148fcba files/digest-swt-3.3_rc4 813 diff --git a/dev-java/swt/files/digest-swt-3.3_rc4 b/dev-java/swt/files/digest-swt-3.3_rc4 new file mode 100644 index 000000000000..67f94285021f --- /dev/null +++ b/dev-java/swt/files/digest-swt-3.3_rc4 @@ -0,0 +1,9 @@ +MD5 d0b279788bcab9e071b5d0a5cf16d5eb swt-3.3RC4-gtk-linux-ppc.zip 4514325 +RMD160 fd1494ff909781a4266390c711b72117096e0df8 swt-3.3RC4-gtk-linux-ppc.zip 4514325 +SHA256 89c3d3af00323bac47bf001b11c21b3b02b27d8c0f290cfbc7691de790ca01b7 swt-3.3RC4-gtk-linux-ppc.zip 4514325 +MD5 9620dc4effa4563b69a8550543381609 swt-3.3RC4-gtk-linux-x86.zip 4448002 +RMD160 1587f2a918de0ce5ee64055e43636982b9533e40 swt-3.3RC4-gtk-linux-x86.zip 4448002 +SHA256 3ba284e1ff70e5c2895aafba9824e281bfdc5446ec733dd3eaf6f82fac26493e swt-3.3RC4-gtk-linux-x86.zip 4448002 +MD5 e27d2fefa0b23140d1c96415053cf9b0 swt-3.3RC4-gtk-linux-x86_64.zip 4622486 +RMD160 ca19c8e0a358860e5997b7e638ed59da604d8db4 swt-3.3RC4-gtk-linux-x86_64.zip 4622486 +SHA256 628d8ad5b1b58d2d3cfc177edcefa9794a449f2080807f982d04dda6b2b8796f swt-3.3RC4-gtk-linux-x86_64.zip 4622486 diff --git a/dev-java/swt/files/swt-3.3_rc4-callback-pointer-dereferencing.patch b/dev-java/swt/files/swt-3.3_rc4-callback-pointer-dereferencing.patch new file mode 100644 index 000000000000..92fbab779d1c --- /dev/null +++ b/dev-java/swt/files/swt-3.3_rc4-callback-pointer-dereferencing.patch @@ -0,0 +1,23 @@ +# patch from gcj-overlay, not sure if by geki himself +# removes QA warning about strict-aliasing +--- callback.c.orig 2006-12-12 17:25:26.000000000 +0100 ++++ callback.c 2006-12-12 18:11:34.000000000 +0100 +@@ -250,12 +250,16 @@ + + #ifdef JNI_VERSION_1_2 + if (IS_JNI_1_2) { +- (*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2); ++ /* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */ ++ /* jint GetEnv(JavaVM *vm, void **env, jint version); */ ++ (*jvm)->GetEnv(jvm, (void *)&env, JNI_VERSION_1_2); + } + #endif + + if (env == NULL) { +- (*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL); ++ /* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */ ++ /* jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args); */ ++ (*jvm)->AttachCurrentThread(jvm, (void *)&env, NULL); + if (IS_JNI_1_2) detach = 1; + } + diff --git a/dev-java/swt/swt-3.3_rc4.ebuild b/dev-java/swt/swt-3.3_rc4.ebuild new file mode 100644 index 000000000000..32e6c6b8f6ff --- /dev/null +++ b/dev-java/swt/swt-3.3_rc4.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3_rc4.ebuild,v 1.1 2007/06/18 10:26:49 caster Exp $ + +inherit eutils java-pkg-2 java-ant-2 toolchain-funcs + +MY_PV="${PV/_rc/RC}" +#MY_PV="${PV}" +MY_DMF="S-${MY_PV}-200706081718" +MY_P="${PN}-${MY_PV}" +# https://overlays.gentoo.org/svn/proj/java/other/swt-patches +#PATCHSET="${P}-gentoo-patches-r1" +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/" +SRC_URI="x86? ( + http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + x86-fbsd? ( + http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + amd64? ( + http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip + ) + ppc? ( + http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-ppc.zip + )" +# mirror://gentoo/${PATCHSET}.tar.bz2" + +SLOT="3" +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" + +IUSE="cairo firefox gnome seamonkey opengl xulrunner" +COMMON=">=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6.8 + >=dev-libs/atk-1.10.2 + cairo? ( >=x11-libs/cairo-1.0.2 ) + gnome? ( + =gnome-base/libgnome-2* + =gnome-base/gnome-vfs-2* + =gnome-base/libgnomeui-2* + ) + seamonkey? ( !firefox? ( !xulrunner? ( + >=www-client/seamonkey-1.0.2 + >=dev-libs/nspr-4.6.2 + ) ) ) + firefox? ( !xulrunner? ( + >=www-client/mozilla-firefox-2 + >=dev-libs/nspr-4.6.2 + ) ) + xulrunner? ( + net-libs/xulrunner + >=dev-libs/nspr-4.6.2 + ) + opengl? ( + virtual/opengl + virtual/glu + )" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-proto/xextproto + ${COMMON}" + +# java-config for the env_var stuff, until it's stabled and forced by eclass +RDEPEND=">=virtual/jre-1.4 + x11-libs/libXtst + >=dev-java/java-config-2.0.33 + ${COMMON}" + +S="${WORKDIR}" + +src_unpack() { + # determine the right file to unpack from $A +# local DISTFILE=${A/${PATCHSET}.tar.bz2/} + # just in case patchset is ordered before distfile +# DISTFILE=${DISTFILE## } + local DISTFILE="${A}" + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile" + unpack ./src.zip + +# unpack "${PATCHSET}.tar.bz2" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +# rm -v .classpath .project || die + + # 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" + + # apply all the patches, including arch-specific +# EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch + + sed -i "s/CFLAGS = -O -Wall/CFLAGS = ${CFLAGS} -Wall/" \ + make_linux.mak \ + || die "Failed to tweak make_linux.mak" + + sed -i "s/MOZILLACFLAGS = -O/MOZILLACFLAGS = ${CXXFLAGS}/" \ + make_linux.mak \ + || die "Failed to tweak make_linux.mak" + + # kill some strict-aliasing warnings + epatch "${FILESDIR}/${P}-callback-pointer-dereferencing.patch" +} + +get_gecko() { + local gecko + + # order here match the logic in DEPEND and USE flag descriptions + use seamonkey && gecko="seamonkey" + use firefox && gecko="firefox" + use xulrunner && gecko="xulrunner" + + echo ${gecko} +} + +src_compile() { + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + # Identify the AWT path + # The IBM VMs and the GNU GCC implementations do not store the AWT libraries + # in the same location as the rest of the binary VMs. + if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then + export AWT_LIB_PATH=$JAVA_HOME/jre/bin + elif [[ ! -z "$(java-config --java-version | grep 'GNU libgcj')" ]] ; then + export AWT_LIB_PATH=$JAVA_HOME/$(get_libdir) + else + if [[ $(tc-arch) == 'x86' ]] ; then + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 + elif [[ $(tc-arch) == 'ppc' ]] ; then + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/ppc + else + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 + fi + fi + + # Fix the pointer size for AMD64 + [[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 + + local platform="linux" + + use elibc_FreeBSD && platform="freebsd" + + local make="emake -f make_${platform}.mak NO_STRIP=y" + + einfo "Building AWT library" + ${make} make_awt || die "Failed to build AWT support" + + einfo "Building SWT library" + ${make} make_swt || die "Failed to build SWT support" + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk || die "Failed to build ATK support" + + if use gnome ; then + einfo "Building GNOME VFS support" + ${make} make_gnome || die "Failed to build GNOME VFS support" + fi + + local gecko="$(get_gecko)" + if [[ ${gecko} ]]; then + einfo "Building the Mozilla component against ${gecko}" + #local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)" + local inc="$(pkg-config ${gecko}-xpcom --cflags)" + local libs="$(pkg-config ${gecko}-xpcom --libs)" + MOZILLA_INCLUDES="${inc}" \ + MOZILLA_LIBS="${libs}" \ + ${make} make_mozilla || die "Failed to build ${gecko} support" + if [[ "${gecko}" = "xulrunner" ]]; then + XULRUNNER_INCLUDES="${inc}" \ + XULRUNNER_LIBS="${libs}" \ + ${make} make_xulrunner || die "Failed to build ${gecko} support" + fi + fi + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo || die "Unable to build CAIRO support" + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx || die "Unable to build OpenGL component" + 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/" + + einfo "Packing JNI libraries" + eant jar +} + +src_install() { + java-pkg_dojar swt.jar + + java-pkg_sointo /usr/$(get_libdir) + java-pkg_doso *.so + + local gecko="$(get_gecko)" + if [[ -n "${gecko}" ]]; then + local gecko_dir="$(pkg-config ${gecko}-xpcom --variable=libdir)" + java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}" + fi + + dohtml about.html || die +} + |