Hi,
here's a diff to convert devel/eclipse/sdk to use xulrunner 1.9 instead of
1.8, which is approaching the grave. It builds and runs fine here,
although i have no idea how to test that bloa^Wshit^Wmonster, nor i know
if the basic testing i did used this 'swt browser'.
http://www.eclipse.org/swt/faq.php#whatisbrowser means nothing to me
either.
so if you really use eclipse please test this diff, and report
success/failure. I don't want it to be the blocker for removing
xulrunner 1.8, so if i get no reply within some weeks i'll just go
ahead. Our eclipse port is 3 years old anyway - if someone could step up
and update it...
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/eclipse/sdk/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile 22 Dec 2009 15:31:26 -0000 1.53
+++ Makefile 10 Jul 2010 10:13:53 -0000
@@ -11,9 +11,9 @@
ECLIPSE_VER= 3.2.2
DISTNAME= eclipse-sourceBuild-srcIncluded-${ECLIPSE_VER}
PKGNAME= eclipse-sdk-${ECLIPSE_VER}
-PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}p12
+PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}p13
PKGNAME-swt= swt-${ECLIPSE_VER}p1
-PKGNAME-gnome= swt-gnome-${ECLIPSE_VER}p2
+PKGNAME-gnome= swt-gnome-${ECLIPSE_VER}p3
PKGNAME-browser= swt-browser-${ECLIPSE_VER}p3
SHARED_LIBS= swt-atk-gtk-3236 4.0 \
swt-awt-gtk-3236 4.0 \
@@ -57,7 +57,7 @@
MODULES= java devel/gettext
MODJAVA_VER= 1.5+
-BUILD_DEPENDS= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel \
+BUILD_DEPENDS= :xulrunner-devel->=1.9:devel/xulrunner/1.9,-devel \
:apache-ant->=1.6.1:devel/apache-ant
USE_GMAKE= Yes
@@ -78,7 +78,8 @@
freetype atk-1.0 glib-2.0 gmodule-2.0 \
gobject-2.0 glitz png iconv intl \
pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo \
- pixman-1 gio-2.0 pthread-stubs xcb
+ pixman-1 gio-2.0 pthread-stubs xcb \
+ gthread-2.0 pthread xcb-render xcb-render-util
LIB_DEPENDS-swt= gtk-x11-2.0::x11/gtk+2
WANTLIB-swt= GL GLU Xtst m atk-1.0 cairo gthread-2.0
@@ -88,10 +89,10 @@
WANTLIB-gnome= gnome-2 gnomevfs-2
RUN_DEPENDS-browser= :swt-${ECLIPSE_VER}:devel/eclipse/sdk,-swt
-LIB_DEPENDS-browser=
xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8,<1.9:devel/xulrunner/1.8
-WANTLIB-browser= c nspr4 plc4 plds4
+LIB_DEPENDS-browser=
xulrunner1.9/xpcom,xulrunner1.9/xul:xulrunner->=1.9:devel/xulrunner/1.9
+WANTLIB-browser= c nspr4 plc4 plds4 m stdc++
-MOZILLA_HOME= ${LOCALBASE}/xulrunner
+MOZILLA_HOME= ${LOCALBASE}/xulrunner1.9
ECLIPSE_WS= gtk
ECLIPSE_BUILD= 3236
ECLIPSE_OS= openbsd
Index: patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh
===================================================================
RCS file:
/cvs/ports/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v
retrieving revision 1.5
diff -u -r1.5 patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh
--- patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh
12 Jan 2007 18:46:37 -0000 1.5
+++ patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh
10 Jul 2010 10:13:53 -0000
@@ -47,9 +47,9 @@
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
- GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
-+ if [ x`pkg-config --exists xulrunner-xpcom && echo YES` = "xYES" ]; then
-+ GECKO_INCLUDES="`pkg-config --cflags xulrunner-xpcom`
-I`pkg-config --variable=includedir xulrunner-xpcom`/embed_base"
-+ GECKO_LIBS="`pkg-config --libs xulrunner-xpcom` `pkg-config
--libs xulrunner-gtkmozembed`"
++ if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
++ GECKO_INCLUDES="`pkg-config --cflags libxul`"
++ GECKO_LIBS="`pkg-config --libs libxul` "
export GECKO_INCLUDES
export GECKO_LIBS
MAKE_MOZILLA=make_mozilla
