mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

. Use the webkit-gtk2 library to provide the SWT browser functions instead

Browse Source 
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>
This commit is contained in:
Greg Lewis 2013-03-03 02:51:25 +00:00
parent 1a0966f6a0
commit a4674fe177
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=313322
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/eclipse/Makefile
View File

@ -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/patch \
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

21
java/eclipse/files/freebsd-support.patch
View File

@ -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