commit: 89bff051299c4c6a1e6ad456eb3489d86cdcf879 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Jan 28 13:33:58 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jan 28 13:34:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89bff051
dev-java/swt: Drop versions with IUSE="webkit" Closes: https://bugs.gentoo.org/625842 Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../swt/files/swt-3.8.2-libwebkit-compat.patch | 23 --- dev-java/swt/metadata.xml | 3 - dev-java/swt/swt-3.7.2-r1.ebuild | 176 --------------------- dev-java/swt/swt-3.8.2-r1.ebuild | 174 -------------------- 4 files changed, 376 deletions(-) diff --git a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch deleted file mode 100644 index ba537f54024..00000000000 --- a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ -crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91 -http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c -https://bugs.eclipse.org/404776 -https://bugs.gentoo.org/500570 - ---- a/src/org/eclipse/swt/browser/WebKit.java -+++ b/src/org/eclipse/swt/browser/WebKit.java -@@ -597,9 +597,13 @@ public void create (Composite parent, int style) { - */ - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); -- WebKitGTK.soup_session_feature_detach (originalAuth, session); -+ if (originalAuth != 0) { -+ WebKitGTK.soup_session_feature_detach (originalAuth, session); -+ } - OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); -- WebKitGTK.soup_session_feature_attach (originalAuth, session); -+ if (originalAuth != 0) { -+ WebKitGTK.soup_session_feature_attach (originalAuth, session); -+ } - - /* - * Check for proxy values set as documented java properties and update the diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml index 3100286ec07..40abe82a75f 100644 --- a/dev-java/swt/metadata.xml +++ b/dev-java/swt/metadata.xml @@ -10,7 +10,4 @@ Eclipse platform in an operating system independent manner. It is analogous to AWT/Swing in Java with a difference - SWT uses a rich set of native widgets. </longdescription> - <use> - <flag name="webkit">Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser.</flag> - </use> </pkgmetadata> diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild deleted file mode 100644 index de15a30fd3e..00000000000 --- a/dev-java/swt/swt-3.7.2-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"; -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 )" - -SLOT="3.7" -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="amd64 ppc64 x86" - -IUSE="cairo gnome opengl webkit" -COMMON=">=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - >=dev-libs/atk-1.10.2 - cairo? ( >=x11-libs/cairo-1.4.14 ) - gnome? ( - =gnome-base/libgnome-2* - =gnome-base/gnome-vfs-2* - =gnome-base/libgnomeui-2* - ) - opengl? ( - virtual/opengl - virtual/glu - ) - webkit? ( >=net-libs/webkit-gtk-1.2:2 ) - x11-libs/libXtst" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto - virtual/pkgconfig - ${COMMON}" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON}" - -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}"/as-needed-and-flag-fixes-3.6.patch - - case ${ARCH} in - ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; - *) epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;; - esac -} - -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" - - 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 || die -} diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild deleted file mode 100644 index e0d8a03d7f0..00000000000 --- a/dev-java/swt/swt-3.8.2-r1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"; -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 )" - -SLOT="3.8" -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="amd64 ppc64 x86" - -IUSE="cairo gnome opengl webkit" -COMMON=">=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - >=dev-libs/atk-1.10.2 - cairo? ( >=x11-libs/cairo-1.4.14 ) - gnome? ( - gnome-base/gnome-vfs:2 - gnome-base/libgnome - gnome-base/libgnomeui - ) - opengl? ( - virtual/opengl - virtual/glu - ) - webkit? ( >=net-libs/webkit-gtk-1.2:2 ) - x11-libs/libXtst" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto - virtual/pkgconfig - ${COMMON}" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON}" - -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 -p "${S}/src" - mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - - epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch - epatch "${FILESDIR}"/${P}-gthread.patch - epatch "${FILESDIR}"/${P}-libwebkit-compat.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" - - 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" || die - 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 -}
