Date: Sun, 3 Mar 2013 02:51:25 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313322 - in head/java/eclipse: . files Message-ID: <201303030251.r232pPUq051404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Mar 3 02:51:25 2013 New Revision: 313322 URL: http://svnweb.freebsd.org/changeset/ports/313322 Log: . Use the webkit-gtk2 library to provide the SWT browser functions instead of libxul since the SWT plugin libraries in the eclipse-devel port will not compile using libxul version 10. PR: 174846 Submitted by: Jimmy Kelley <ljboiler@gmail.com> Modified: head/java/eclipse/Makefile (contents, props changed) head/java/eclipse/files/freebsd-support.patch (contents, props changed) Modified: head/java/eclipse/Makefile ============================================================================== --- head/java/eclipse/Makefile Sun Mar 3 02:09:06 2013 (r313321) +++ head/java/eclipse/Makefile Sun Mar 3 02:51:25 2013 (r313322) @@ -2,7 +2,7 @@ PORTNAME= eclipse PORTVERSION= 3.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \ http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \ @@ -32,7 +32,8 @@ BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/ rsync:${PORTSDIR}/net/rsync \ unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 OPTIONS_DEFINE= TESTS TESTS_DESC= Build SDK test suite @@ -40,7 +41,6 @@ TESTS_DESC= Build SDK test suite ONLY_FOR_ARCHS= i386 amd64 USE_ANT= yes -USE_GECKO= libxul19 USE_GL= glu USE_GMAKE= yes USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui Modified: head/java/eclipse/files/freebsd-support.patch ============================================================================== --- head/java/eclipse/files/freebsd-support.patch Sun Mar 3 02:09:06 2013 (r313321) +++ head/java/eclipse/files/freebsd-support.patch Sun Mar 3 02:51:25 2013 (r313322) @@ -7459,3 +7459,24 @@ $FreeBSD$ else echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" echo " *** Mozilla embedding support will not be compiled." +--- build/eclipse-3.7.1-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2012-12-25 21:01:56.000000000 -0600 ++++ build/eclipse-3.7.1-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2012-12-25 21:28:35.000000000 -0600 +@@ -491,7 +491,7 @@ + export MOZILLA_INCLUDES + export MOZILLA_LIBS + MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then ++ elif [ x`pkg-config --exists "libxul < 2" && echo YES` = "xYES" ]; then + XULRUNNER_INCLUDES=`pkg-config --cflags libxul` + XULRUNNER_LIBS=`pkg-config --libs libxul` + XULRUNNER_LIBS=`echo ${XULRUNNER_LIBS} -lxpcomglue` +--- build/eclipse-3.7.1-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig 2012-12-29 13:05:23.000000000 -0600 ++++ build/eclipse-3.7.1-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak 2012-12-29 13:06:37.000000000 -0600 +@@ -27,6 +27,7 @@ + MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION) + XULRUNNER_PREFIX = swt-xulrunner + XPCOMINIT_PREFIX = swt-xpcominit ++WEBKIT_PREFIX = swt-webkit + GLX_PREFIX = swt-glx + + SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303030251.r232pPUq051404>