From nobody@FreeBSD.org  Mon Feb  4 12:56:21 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 82E58BFE
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  4 Feb 2013 12:56:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 74D021A55
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  4 Feb 2013 12:56:21 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r14CuJkB091154
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 4 Feb 2013 12:56:19 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r14CuJOe091153;
	Mon, 4 Feb 2013 12:56:19 GMT
	(envelope-from nobody)
Message-Id: <201302041256.r14CuJOe091153@red.freebsd.org>
Date: Mon, 4 Feb 2013 12:56:19 GMT
From: Jimmy Kelley <ljboiler@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: libxul 10 does not work for Eclipse-Devel SWT
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         175826
>Category:       ports
>Synopsis:       www/libxul: libxul 10 does not work for Eclipse-Devel SWT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-eclipse
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 04 13:00:00 UTC 2013
>Closed-Date:    Sun Mar 03 02:06:05 UTC 2013
>Last-Modified:  Sun Mar  3 02:10:00 UTC 2013
>Originator:     Jimmy Kelley
>Release:        FreeBSD 9.1-STABLE
>Organization:
>Environment:
FreeBSD jmobile.jimmy.local 9.1-STABLE FreeBSD 9.1-STABLE #4 r245831: Wed Jan 23 07:55:07 CST 2013     root@jmobile.jimmy.local:/usr/obj/usr/src/sys/A205S5823  i386
>Description:
The SWT plugin libraries in the eclipse-devel port will
not compile using libxul version 10.
>How-To-Repeat:
With the libxul 10 port installed, build the eclipse-devel port:
  cd /usr/ports/java/eclipse-devel
  make
The port build will succeed, but a check of the build logs in the
work/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92 directory
will show errors in the building of the SWT native libraries.
>Fix:
Use the webkit-gtk2 library to provide the SWT browser functions instead
of libxul.

Patch attached with submission follows:

--- Makefile.orig	2012-11-16 23:58:42.000000000 -0600
+++ Makefile	2013-02-01 11:11:09.000000000 -0600
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse-devel
 PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/:1 \
 		http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/plugins/:2 \
@@ -40,7 +40,8 @@
 		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"
@@ -48,7 +49,6 @@
 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 pkgconfig
--- files/freebsd-support.patch.orig	2012-11-16 23:58:42.000000000 -0600
+++ files/freebsd-support.patch	2013-02-03 13:21:35.000000000 -0600
@@ -7206,3 +7206,47 @@
  	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-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2013-02-03 07:08:39.000000000 -0600
++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2013-02-03 07:24:06.000000000 -0600
+@@ -493,7 +493,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`
+@@ -506,6 +506,14 @@
+ 	fi
+ fi
+ 
++if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then
++	echo "WebKit found, compiling webkit embedded browser support."
++	MAKE_WEBKIT=make_webkit
++else
++	echo "WebKit not found:"
++	echo "    *** WebKit embedding support will not be compiled."
++fi
++
+ # Find AWT if available
+ if [ -z "${AWT_LIB_PATH}" ]; then
+ 	if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then
+@@ -534,5 +542,5 @@
+ if [ "x${1}" = "xclean" ]; then
+ 	${MAKE_TYPE} -f $MAKEFILE clean
+ else
+-	${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
++	${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
+ fi
+--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig	2013-02-03 07:08:39.000000000 -0600
++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	2013-02-03 07:24:06.000000000 -0600
+@@ -26,7 +26,8 @@
+ GNOME_PREFIX = swt-gnome
+ 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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gecko 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Feb 4 20:56:03 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175826 
Responsible-Changed-From-To: gecko->freebsd-eclipse 
Responsible-Changed-By: flo 
Responsible-Changed-When: Mon Feb 4 23:15:49 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175826 
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Sun Mar 3 02:06:04 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175826 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175826: commit references a PR
Date: Sun,  3 Mar 2013 02:05:36 +0000 (UTC)

 Author: glewis
 Date: Sun Mar  3 02:05:27 2013
 New Revision: 313320
 URL: http://svnweb.freebsd.org/changeset/ports/313320
 
 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:		175826
   Submitted by:	Jimmy Kelley <ljboiler@gmail.com>
 
 Modified:
   head/java/eclipse-devel/Makefile
   head/java/eclipse-devel/files/freebsd-support.patch
 
 Modified: head/java/eclipse-devel/Makefile
 ==============================================================================
 --- head/java/eclipse-devel/Makefile	Sun Mar  3 01:45:00 2013	(r313319)
 +++ head/java/eclipse-devel/Makefile	Sun Mar  3 02:05:27 2013	(r313320)
 @@ -7,7 +7,7 @@
  
  PORTNAME=	eclipse-devel
  PORTVERSION=	4.2.0
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	java devel
  MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/:1 \
  		http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/plugins/:2 \
 @@ -40,7 +40,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"
 @@ -48,7 +49,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 pkgconfig
 
 Modified: head/java/eclipse-devel/files/freebsd-support.patch
 ==============================================================================
 --- head/java/eclipse-devel/files/freebsd-support.patch	Sun Mar  3 01:45:00 2013	(r313319)
 +++ head/java/eclipse-devel/files/freebsd-support.patch	Sun Mar  3 02:05:27 2013	(r313320)
 @@ -7206,3 +7206,47 @@ $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-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2013-02-03 07:08:39.000000000 -0600
 ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2013-02-03 07:24:06.000000000 -0600
 +@@ -493,7 +493,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`
 +@@ -506,6 +506,14 @@
 + 	fi
 + fi
 + 
 ++if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then
 ++	echo "WebKit found, compiling webkit embedded browser support."
 ++	MAKE_WEBKIT=make_webkit
 ++else
 ++	echo "WebKit not found:"
 ++	echo "    *** WebKit embedding support will not be compiled."
 ++fi
 ++
 + # Find AWT if available
 + if [ -z "${AWT_LIB_PATH}" ]; then
 + 	if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then
 +@@ -534,5 +542,5 @@
 + if [ "x${1}" = "xclean" ]; then
 + 	${MAKE_TYPE} -f $MAKEFILE clean
 + else
 +-	${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
 ++	${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
 + fi
 +--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig	2013-02-03 07:08:39.000000000 -0600
 ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	2013-02-03 07:24:06.000000000 -0600
 +@@ -26,7 +26,8 @@
 + GNOME_PREFIX = swt-gnome
 + 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
