Version bump. Adds xulrunner use flag to compile browser support against that (bug...
authorPetteri Räty <betelgeuse@gentoo.org>
Mon, 5 Mar 2007 14:19:11 +0000 (14:19 +0000)
committerPetteri Räty <betelgeuse@gentoo.org>
Mon, 5 Mar 2007 14:19:11 +0000 (14:19 +0000)
Package-Manager: portage-2.1.2-r12

dev-java/swt/ChangeLog
dev-java/swt/Manifest
dev-java/swt/files/digest-swt-3.2.2 [new file with mode: 0644]
dev-java/swt/swt-3.2.2.ebuild [new file with mode: 0644]

index ae78eaa186d2eec033887af4ffa558964c6c924d..29be0866af60614c01791a61c9fdb0334ebd40e9 100644 (file)
@@ -1,6 +1,16 @@
 # 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.59 2007/02/10 15:39:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.60 2007/03/05 14:19:11 betelgeuse Exp $
+
+*swt-3.2.2 (05 Mar 2007)
+
+  05 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> +swt-3.2.2.ebuild:
+  Version bump. Adds xulrunner use flag to compile browser support against
+  that (bug #155969). Because of that I dropped amd64 and ppc keywords because
+  I am not sure if it works there. Also silenced cairo signedness warnings
+  with a patch from Hanno Meyer-Thurow <h.mth@web.de> (bug #157826). x86-fbsd
+  I had to drop because they don't have xulrunner keyworded. Version bump is
+  bug #169254.
 
   10 Feb 2007; nixnut <nixnut@gentoo.org> swt-3.2-r2.ebuild:
   Stable on ppc wrt bug 151358
index b13355126acfd06f17e10e4c67e95d9a2d7c72d7..ed77ab96c73eee6d5f177801a2fdac3305a1f617 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7
 MD5 f5e548bc26a0f1f3c18131be76face40 files/build.xml 458
 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 files/build.xml 458
@@ -29,6 +32,10 @@ DIST swt-3.2.1-gentoo-patches.tar.bz2 3979 RMD160 20e3011c0795b114208a7967724d9e
 DIST swt-3.2.1-gtk-linux-ppc.zip 3043491 RMD160 0246bacb58dc294719435fe6104a84aa512436f8 SHA1 219f91e28cf72517d40958c539658a6ccef58651 SHA256 267e116f59f72d0b701d60a6bf3c410f81c51e7d468862ecbcf34e7bf4e3b096
 DIST swt-3.2.1-gtk-linux-x86.zip 3118312 RMD160 950f1e68c82e6e208ffd6ceeff027e5fa1002d73 SHA1 b1e95288321944bb070bee2bdf4faec8e1aeb275 SHA256 940a5dd90131fe2fa02bcf04374dc168a136100d058042732272ca8e61349e78
 DIST swt-3.2.1-gtk-linux-x86_64.zip 2997030 RMD160 742593d51259b5d41d946558ea0743faf122b17f SHA1 163f48796aff2172b89b7b4cc0d5201ccc49b796 SHA256 f7cda0d51a0b01954b96821b1a1053f7b76760286f82756b87963caae2c93cb5
+DIST swt-3.2.2-gentoo-patches.tar.bz2 6707 RMD160 a35840a279f98b4199c25e6b28aadefa1138f843 SHA1 6bb4ea71490e856bfab9686d2254cccd444d6f08 SHA256 9f56edd328a5f000dce42c01ae83d1d9e4017dc7fd11ed2a8091ebece783d25e
+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
 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
@@ -37,10 +44,14 @@ EBUILD swt-3.2.1.ebuild 5276 RMD160 94f3aab38e4dd630f2f603792c8a4cdc209fca11 SHA
 MD5 f2f9a180d7d6bea4b201303f972fcba6 swt-3.2.1.ebuild 5276
 RMD160 94f3aab38e4dd630f2f603792c8a4cdc209fca11 swt-3.2.1.ebuild 5276
 SHA256 80854a3efbe88e63209dcb35607c8c1559936b06a5566836dad96e4b7a043ee3 swt-3.2.1.ebuild 5276
-MISC ChangeLog 10585 RMD160 24e7b88344aede6da2afeeb77ad6d745219ae7ca SHA1 04c9a25cda4f9f532ba2bd3326f6dac2b4610335 SHA256 7a284b62d63de7e01d4644f75efba044199e7ea3b5303244ca99843952b26cec
-MD5 c636606b613898fb3f167b07aa2e06f4 ChangeLog 10585
-RMD160 24e7b88344aede6da2afeeb77ad6d745219ae7ca ChangeLog 10585
-SHA256 7a284b62d63de7e01d4644f75efba044199e7ea3b5303244ca99843952b26cec ChangeLog 10585
+EBUILD swt-3.2.2.ebuild 5538 RMD160 3911c686f28ff26c6818bf161504ec03223d9c4b SHA1 59501d008f86f72f385a9dff58302254bbbce083 SHA256 e49297efb579b9e973e229f9945e657761428ad1965bd5d982bfc45f56a4cd46
+MD5 0a3aa1da8f1d2d298003e78ae9caefb1 swt-3.2.2.ebuild 5538
+RMD160 3911c686f28ff26c6818bf161504ec03223d9c4b swt-3.2.2.ebuild 5538
+SHA256 e49297efb579b9e973e229f9945e657761428ad1965bd5d982bfc45f56a4cd46 swt-3.2.2.ebuild 5538
+MISC ChangeLog 11087 RMD160 834c5500702e4c2c97088b13c13d2d78a1b8e58a SHA1 15e519267000eb2302a0b4b4fb0a8e70a4d415bc SHA256 b569fef5f906d4fcb09a28237e79accb368dec192554a86bfe8ab2a464046a9b
+MD5 ca37c4751fc5e5678b0022a4d2056c2a ChangeLog 11087
+RMD160 834c5500702e4c2c97088b13c13d2d78a1b8e58a ChangeLog 11087
+SHA256 b569fef5f906d4fcb09a28237e79accb368dec192554a86bfe8ab2a464046a9b ChangeLog 11087
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440
@@ -51,3 +62,13 @@ SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/di
 MD5 b1b92585d08574017b21246e5bee6c45 files/digest-swt-3.2.1 1075
 RMD160 f11b1c0e8775d8a9f96918fd2b632f276b0f577e files/digest-swt-3.2.1 1075
 SHA256 8a4fdc86dcf1d19555dbec690d191b180265908405983e1396a311132d3975e5 files/digest-swt-3.2.1 1075
+MD5 74eb3bd4dcec760c0ea6bce55fa387b5 files/digest-swt-3.2.2 1075
+RMD160 55d3019d53a86a8616f719d0dfd787d4ffa6f696 files/digest-swt-3.2.2 1075
+SHA256 4284c56544b366b08d35f501ba716a29474e3463277967885b0f4ad9df2bb407 files/digest-swt-3.2.2 1075
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7CQOcxLzpIGCsLQRAnctAKCFua7i5LD8UK7sSvScFy4DYcKSlwCffjGb
+500oMpu4oNcnZ6Q1BRb9zhs=
+=7iOs
+-----END PGP SIGNATURE-----
diff --git a/dev-java/swt/files/digest-swt-3.2.2 b/dev-java/swt/files/digest-swt-3.2.2
new file mode 100644 (file)
index 0000000..5d856f4
--- /dev/null
@@ -0,0 +1,12 @@
+MD5 769d0f2efa3894e56966783015862a33 swt-3.2.2-gentoo-patches.tar.bz2 6707
+RMD160 a35840a279f98b4199c25e6b28aadefa1138f843 swt-3.2.2-gentoo-patches.tar.bz2 6707
+SHA256 9f56edd328a5f000dce42c01ae83d1d9e4017dc7fd11ed2a8091ebece783d25e swt-3.2.2-gentoo-patches.tar.bz2 6707
+MD5 45d1f0ff0de9c95fcd92836fea79927c swt-3.2.2-gtk-linux-ppc.zip 3042753
+RMD160 dbec93a4fa1f256a06ff856e5aba8a22a927a52a swt-3.2.2-gtk-linux-ppc.zip 3042753
+SHA256 e5a03729ee01c32950a2244e0d1b8159d988264bc1b335af1b926cba51155450 swt-3.2.2-gtk-linux-ppc.zip 3042753
+MD5 e1340b6c7cf9b617145667b15b02fd49 swt-3.2.2-gtk-linux-x86.zip 3117432
+RMD160 b99c00a6f43316cb82bd38f1e8bd92eea4006b78 swt-3.2.2-gtk-linux-x86.zip 3117432
+SHA256 aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28 swt-3.2.2-gtk-linux-x86.zip 3117432
+MD5 d678cedc336a58b0147081b56de6a1f3 swt-3.2.2-gtk-linux-x86_64.zip 2996317
+RMD160 81ca3cfa69ab084d9bbe04d8ac6a941c65b46b15 swt-3.2.2-gtk-linux-x86_64.zip 2996317
+SHA256 a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56 swt-3.2.2-gtk-linux-x86_64.zip 2996317
diff --git a/dev-java/swt/swt-3.2.2.ebuild b/dev-java/swt/swt-3.2.2.ebuild
new file mode 100644 (file)
index 0000000..cb21296
--- /dev/null
@@ -0,0 +1,194 @@
+# 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.2.2.ebuild,v 1.1 2007/03/05 14:19:11 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+MY_DMF="R-${PV}-200702121330"
+# https://overlays.gentoo.org/svn/proj/java/other/swt-patches
+PATCHSET="${PN}-3.2.2-gentoo-patches"
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+                       http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
+               )
+               x86-fbsd? (
+                       http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
+               )
+               amd64? (
+                       http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86_64.zip
+               )
+               ppc? (
+                       http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-ppc.zip
+               )
+               mirror://gentoo/${PATCHSET}.tar.bz2"
+
+SLOT="3"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~x86"
+
+IUSE="cairo 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? (
+                                       >=www-client/seamonkey-1.0.2
+                                       >=dev-libs/nspr-4.6.2
+                               )
+               xulrunner? (
+                                       net-libs/xulrunner
+                               )
+               opengl? (
+                                       virtual/opengl
+                                       virtual/glu
+                               )"
+DEPEND=">=virtual/jdk-1.4
+               ${COMMON}
+               dev-java/ant-core
+               app-arch/unzip
+               x11-libs/libX11
+               x11-libs/libXrender
+               x11-libs/libXt
+               x11-proto/xextproto"
+
+RDEPEND=">=virtual/jre-1.4
+               x11-libs/libXtst
+               ${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## }
+       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/
+       rm -f .classpath .project
+
+       # 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"
+
+       cp make_linux.mak make_freebsd.mak
+
+       #  https://bugs.eclipse.org/bugs/show_bug.cgi?id=167173
+       epatch "${FILESDIR}/${PN}-3.2.1-fbsd.patch"
+}
+
+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 GTK+ Library path
+       export GTKLIBS="$(pkg-config --libs-only-L gtk+-2.0 gthread-2.0) \
+               -lgtk-x11-2.0 -lgthread-2.0 -L/usr/$(get_libdir)/X11 -lXtst"
+
+       # 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
+
+       # Wasn't able to succesfully run test with this
+       # http://overlays.gentoo.org/proj/java/browser/testcases/dev-java/swt
+       #use firefox && local gecko="firefox"
+       use seamonkey && local gecko="seamonkey"
+       use xulrunner && local gecko="xulrunner"
+
+       if [[ ${gecko} ]]; then
+               einfo "Building the Mozilla component"
+               #local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
+               local inc="$(pkg-config ${gecko}-xpcom --cflags)"
+               GECKO_INCLUDES="${inc}" \
+               GECKO_LIBS="$(pkg-config ${gecko}-xpcom --libs)" \
+                       ${make} make_mozilla || die "Failed to build Mozilla support"
+       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
+
+       dohtml about.html || die
+}
+