cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the -browser subpackage.

Browse Source 
It's broken at runtime anyway since the switch from xul 1.8 to 1.9 three
years ago, is now the last user of xul 1.9, and noone is probably using
an eclipse from 2007 to do "serious" java development. Lots of cursing
involved to find the correct magic to properly disable the building of
swt-mozilla-gtk.

Discussed with kurt@ (MAINTAINER)
This commit is contained in:
landry 2013-12-07 12:03:27 +00:00
parent 4eef3dbb4f
commit 9848b53352
5 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/eclipse/sdk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2013/11/25 14:16:22 sthen Exp $
# $OpenBSD: Makefile,v 1.74 2013/12/07 12:03:27 landry Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
@ -6,26 +6,22 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT-main= general-purpose, extensible IDE for Java & other langs
COMMENT-swt= widget toolkit for Java
COMMENT-gnome= GNOME integration library for swt/eclipse
COMMENT-browser= HTML Browser Widget library for swt/eclipse
ECLIPSE_VER= 3.2.2
DISTNAME= eclipse-sourceBuild-srcIncluded-${ECLIPSE_VER}
PKGNAME= eclipse-sdk-${ECLIPSE_VER}
PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}
REVISION-main= 20
REVISION-main= 21
PKGNAME-swt= swt-${ECLIPSE_VER}
REVISION-swt= 5
PKGNAME-gnome= swt-gnome-${ECLIPSE_VER}
REVISION-gnome= 5
PKGNAME-browser= swt-browser-${ECLIPSE_VER}
REVISION-browser= 9
SHARED_LIBS= swt-atk-gtk-3236 4.0 \
swt-awt-gtk-3236 4.0 \
swt-gtk-3236 4.0 \
swt-pi-gtk-3236 4.0 \
swt-cairo-gtk-3236 4.0 \
swt-gnome-gtk-3236 4.0 \
swt-mozilla-gtk-3236 4.0 \
swt-glx-gtk-3236 4.0
CATEGORIES= devel
@ -57,11 +53,10 @@ BUILD_DEPENDS= devel/xulrunner/1.9,-devel \
USE_GMAKE= Yes
MULTI_PACKAGES= -main -swt -gnome -browser
MULTI_PACKAGES= -main -swt -gnome
RUN_DEPENDS-main= java/javaPathHelper \
${MODJAVA_RUN_DEPENDS} \
swt-browser-${ECLIPSE_VER}:devel/eclipse/sdk,-browser \
devel/desktop-file-utils
LIB_DEPENDS-main= x11/gtk+2
@ -82,11 +77,6 @@ RUN_DEPENDS-gnome= swt-${ECLIPSE_VER}:devel/eclipse/sdk,-swt
LIB_DEPENDS-gnome= x11/gnome/libgnomeui
WANTLIB-gnome= gnome-2 gnomevfs-2 gnomeui-2
RUN_DEPENDS-browser= swt-${ECLIPSE_VER}:devel/eclipse/sdk,-swt
LIB_DEPENDS-browser= devel/xulrunner/1.9
WANTLIB-browser= xulrunner1.9/xpcom xulrunner1.9/xul c nspr4 plc4 plds4 m stdc++
MOZILLA_HOME= ${LOCALBASE}/xulrunner1.9
ECLIPSE_WS= gtk
ECLIPSE_BUILD= 3236
ECLIPSE_OS= openbsd
@ -101,7 +91,6 @@ MAKE_ENV= ECLIPSE_BUILD=${ECLIPSE_BUILD} \
ECLIPSE_OS=${ECLIPSE_OS} \
ECLIPSE_WS=${ECLIPSE_WS} \
JAVA_HOME=${JAVA_HOME} \
MOZILLA_HOME=${MOZILLA_HOME} \
CC="${CC}" CXX="${CXX}" \
LIBswt_atk_gtk_VERSION=${LIBswt-atk-gtk-3236_VERSION} \
LIBswt_awt_gtk_VERSION=${LIBswt-awt-gtk-3236_VERSION} \
@ -109,7 +98,6 @@ MAKE_ENV= ECLIPSE_BUILD=${ECLIPSE_BUILD} \
LIBswt_pi_gtk_VERSION=${LIBswt-pi-gtk-3236_VERSION} \
LIBswt_cairo_gtk_VERSION=${LIBswt-cairo-gtk-3236_VERSION} \
LIBswt_gnome_gtk_VERSION=${LIBswt-gnome-gtk-3236_VERSION} \
LIBswt_mozilla_gtk_VERSION=${LIBswt-mozilla-gtk-3236_VERSION} \
LIBswt_glx_gtk_VERSION=${LIBswt-glx-gtk-3236_VERSION}
FAKE_FLAGS= ${MAKE_ENV}
@ -133,7 +121,6 @@ do-install:
@tar xzf ${WRKBUILD}/result/openbsd-gtk-${ECLIPSE_ARCH}-sdk.tar.gz \
-C ${PREFIX}
@sed -e "s+%%ECLIPSE_HOME%%+${TRUEPREFIX}/eclipse+g" \
-e "s+%%MOZILLA_FIVE_HOME%%+${TRUEPREFIX}/xulrunner1.9+g" \
${WRKBUILD}/eclipse.in > ${WRKBUILD}/eclipse.tmp
${INSTALL_SCRIPT} ${WRKBUILD}/eclipse.tmp ${PREFIX}/bin/eclipse
${INSTALL_PROGRAM} ${WRKBUILD}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse

28
devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v 1.7 2012/04/07 13:11:27 landry Exp $
--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Thu Sep 21 10:57:18 2006
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Wed Dec 13 22:33:39 2006
$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v 1.8 2013/12/07 12:03:27 landry Exp $
--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Mon Feb 12 19:46:52 2007
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat Dec 7 11:49:21 2013
@@ -27,6 +27,10 @@ if [ "${OS}" = "" ]; then
OS=`uname -s`
fi
@ -40,20 +40,26 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v 1.
SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
export SWT_PTR_CFLAGS
if [ -d /lib64 ]; then
@@ -87,9 +91,9 @@ else
@@ -87,16 +91,8 @@ else
fi
if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
- 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 libxul19 && echo YES` = "xYES" ]; then
+ GECKO_INCLUDES="`pkg-config --cflags libxul19`"
+ GECKO_LIBS="`pkg-config --libs libxul19` "
export GECKO_INCLUDES
export GECKO_LIBS
MAKE_MOZILLA=make_mozilla
@@ -124,7 +128,7 @@ if [ "x${OUTPUT_DIR}" = "x" ]; then
- export GECKO_INCLUDES
- export GECKO_LIBS
- MAKE_MOZILLA=make_mozilla
- else
- echo "Mozilla/XPCOM libraries not found:"
- echo " *** Mozilla embedding support will not be compiled."
- fi
+ echo "Mozilla/XPCOM libraries not found:"
+ echo " *** Mozilla embedding support will not be compiled."
fi
# Find AWT if available
@@ -124,7 +120,7 @@ if [ "x${OUTPUT_DIR}" = "x" ]; then
fi
if [ "x${1}" = "xclean" ]; then

4
devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak,v 1.6 2007/04/06 02:16:21 kurt Exp $
$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak,v 1.7 2013/12/07 12:03:27 landry Exp $
--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_openbsd.mak.orig Thu Apr 5 08:12:42 2007
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_openbsd.mak Thu Apr 5 08:59:10 2007
@@ -30,18 +30,18 @@ PROFILE17_PREFIX = swt-mozilla17-profile$(GCC_VERSION)
@ -49,7 +49,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_
-all: make_swt make_atk make_gnome make_glx
+all: make_swt make_atk make_gnome make_glx make_mozilla
+all: make_swt make_atk make_gnome make_glx
#
# SWT libs

2
devel/eclipse/sdk/pkg/DESCR-browser
View File

@ -1,2 +0,0 @@
HTML Browser Widget library for swt/eclipse. This package is needed for
the internal browser to work in eclipse.

4
devel/eclipse/sdk/pkg/PLIST-browser
View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PLIST-browser,v 1.2 2007/04/13 14:30:43 kurt Exp $
@conflict eclipse-sdk-gtk2-mozilla-<=3.0.1
@pkgpath devel/eclipse/sdk,-mozilla
@lib lib/libswt-mozilla-gtk-3236.so.${LIBswt-mozilla-gtk-3236_VERSION}