Date: Thu, 11 Sep 2008 22:43:55 -0400 From: "Stephane E. Potvin" <sepotvin@videotron.ca> To: Jonathan Chen <jonc@chen.org.nz> Cc: freebsd-eclipse@freebsd.org Subject: Re: eclipse-devel and WITH_GECKO=xulrunner Message-ID: <48C9D76B.2000102@videotron.ca> In-Reply-To: <20080911035442.GA33990@osiris.chen.org.nz> References: <20080911035442.GA33990@osiris.chen.org.nz>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Boundary_(ID_rHM3cDQynnxp5O57SsNdug) Content-type: text/plain; charset=UTF-8; format=flowed Content-transfer-encoding: 7BIT -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Jonathan Chen wrote: | Hi, | | First of all, thanks to all involved for the Eclipse 3.4 port. It's | great to be using something relatively up to date. | | However, I've noticed that the eclipse-devel port will only work for | WITH_GECKO=firefox. If WITH_GECKO=xulrunner is used, the port will | build but will not run. Any chance for a fix for this? | | Cheers. Could you try the attached patch? It should hopefully fix the problem when trying to use xulrunner. The patch should fix the support for both xulrunner and seamonkey (on x86 and amd64). I removed mozilla support in the gecko list as the port is marked deprecated (though the support is still present but untested in the patch). Regards, Steph -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkjJ12cACgkQmdOXtTCX/nucQQCgt/K4Hu3buY9SjPuGahZ8ct1V +YMAnR8JeM1D2JHijpTy15MB+Y7Y4gzJ =yV/6 -----END PGP SIGNATURE----- --Boundary_(ID_rHM3cDQynnxp5O57SsNdug) Content-type: text/x-patch; CHARSET=US-ASCII; name=gecko.diff Content-transfer-encoding: 7BIT Content-disposition: inline; filename=gecko.diff Index: Makefile =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile 6 Sep 2008 19:31:47 -0000 1.19 +++ Makefile 12 Sep 2008 02:22:11 -0000 @@ -7,6 +7,7 @@ PORTNAME= eclipse-devel PORTVERSION= 3.4 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} MASTER_SITE_SUBDIR= R-${PORTVERSION}-200806172000 @@ -31,7 +32,7 @@ PATCH= ${LOCALBASE}/bin/gpatch .if !defined(WITHOUT_MOZILLA) -USE_GECKO= firefox xulrunner mozilla seamonkey +USE_GECKO= firefox xulrunner seamonkey .endif USE_JAVA= yes Index: files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh,v retrieving revision 1.1 diff -u -r1.1 post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh --- files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 6 Sep 2008 19:31:48 -0000 1.1 +++ files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 12 Sep 2008 01:18:51 -0000 @@ -1,5 +1,5 @@ ---- gtk/library/build.sh.orig 2008-08-02 20:48:26.157201172 -0400 -+++ gtk/library/build.sh 2008-08-02 22:49:45.246241822 -0400 +--- gtk/library/build.sh.orig 2008-09-11 21:18:02.725614374 -0400 ++++ gtk/library/build.sh 2008-09-11 21:18:07.455632295 -0400 @@ -50,6 +50,10 @@ fi fi @@ -20,7 +20,7 @@ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then -@@ -74,23 +78,28 @@ +@@ -74,47 +78,44 @@ fi fi @@ -30,43 +30,80 @@ -else - echo "libgnome-2.0 and libgnomeui-2.0 not found:" - echo " *** SWT Program support for GNOME will not be compiled." +-fi +- +-if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then +- echo "Cairo found, compiling SWT support for the cairo graphics library." +- MAKE_CAIRO=make_cairo +-else +- echo "Cairo not found:" +- echo " *** Advanced graphics support using cairo will not be compiled." +if [ x${MAKE_GNOME} = "xmake_gnome" ]; then + if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then + echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" -+ MAKE_GNOME=make_gnome ++ _MAKE_GNOME=make_gnome + else + echo "libgnome-2.0 and libgnomeui-2.0 not found:" + echo " *** SWT Program support for GNOME will not be compiled." + fi fi --if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then -- echo "Cairo found, compiling SWT support for the cairo graphics library." -- MAKE_CAIRO=make_cairo --else -- echo "Cairo not found:" -- echo " *** Advanced graphics support using cairo will not be compiled." +-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` +- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags libxul` +- MOZILLA_LIBS=`pkg-config --libs libxul` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then + if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then + echo "Cairo found, compiling SWT support for the cairo graphics library." -+ MAKE_CAIRO=make_cairo -+ else ++ _MAKE_CAIRO=make_cairo + else +- echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" +- echo " *** Mozilla embedding support will not be compiled." + echo "Cairo not found:" + echo " *** Advanced graphics support using cairo will not be compiled." -+ fi + fi fi --if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then + if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` - MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` -@@ -113,6 +122,7 @@ - echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." - fi ++ case ${BROWSER} in ++ "firefox" | "mozilla" | "seamonkey" | "xulrunner") ++ MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}-xpcom` ++ MOZILLA_LIBS=`pkg-config --libs ${BROWSER}-xpcom` ++ export MOZILLA_INCLUDES ++ export MOZILLA_LIBS ++ _MAKE_MOZILLA=make_mozilla ++ ;; ++ *) ++ echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" ++ echo " *** Mozilla embedding support will not be compiled." ++ ;; ++ esac + fi - fi - ++fi ++ # Find AWT if available + if [ -z "${AWT_LIB_PATH}" ]; then + if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then +@@ -142,5 +143,5 @@ + if [ "x${1}" = "xclean" ]; then + make -f $MAKEFILE clean + else +- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ++ make -f $MAKEFILE all $_MAKE_GNOME $_MAKE_CAIRO $MAKE_AWT $_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} + fi --Boundary_(ID_rHM3cDQynnxp5O57SsNdug) Content-type: application/octet-stream; name=gecko.diff.sig Content-transfer-encoding: base64 Content-disposition: attachment; filename=gecko.diff.sig iEYEABECAAYFAkjJ12oACgkQmdOXtTCX/ns9VQCfcgGg2BGo0UH0M7Vwz49GzY3JjD0AoKud MWS268cHUu27JCNlakknq0WV --Boundary_(ID_rHM3cDQynnxp5O57SsNdug)--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?48C9D76B.2000102>