From e31260f1cbf3f58e8fdfeb0fd67f08b31c28800b Mon Sep 17 00:00:00 2001 From: kurt Date: Fri, 6 Apr 2007 02:16:21 +0000 Subject: [PATCH] Fix build on amd64 by adding missing -fPIC to swt-browser link. also regen patches while here. --- devel/eclipse/sdk/Makefile | 4 ++-- ...se_platform_launchers_library_eclipseShm_c | 8 ++++---- ...se_platform_launchers_library_gtk_build_sh | 8 ++++---- ...platform_launchers_target_build_properties | 8 ++++---- ...lipse_SWT_Mozilla_common_library_xpcom_cpp | 6 +++--- ...rg_eclipse_swt_internal_mozilla_XPCOM_java | 6 +++--- ...a_gtk_org_eclipse_swt_browser_Browser_java | 12 ++++++------ ...clipse_SWT_PI_gtk_library_make_openbsd_mak | 19 ++++++++++++++----- .../patches/patch-too_long_XPCOM_properties | 8 ++++---- 9 files changed, 44 insertions(+), 35 deletions(-) diff --git a/devel/eclipse/sdk/Makefile b/devel/eclipse/sdk/Makefile index 910a7c95aa2..c924d99ddf9 100644 --- a/devel/eclipse/sdk/Makefile +++ b/devel/eclipse/sdk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2007/01/26 14:15:37 kurt Exp $ +# $OpenBSD: Makefile,v 1.31 2007/04/06 02:16:21 kurt Exp $ ONLY_FOR_ARCHS= amd64 i386 @@ -13,7 +13,7 @@ PKGNAME= eclipse-sdk-${ECLIPSE_VER} PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}p1 PKGNAME-swt= swt-${ECLIPSE_VER} PKGNAME-gnome= swt-gnome-${ECLIPSE_VER} -PKGNAME-browser= swt-browser-${ECLIPSE_VER}p0 +PKGNAME-browser= swt-browser-${ECLIPSE_VER}p1 SHARED_LIBS= swt-atk-gtk-3235 4.0 \ swt-awt-gtk-3235 4.0 \ swt-gtk-3235 4.0 \ diff --git a/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_eclipseShm_c b/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_eclipseShm_c index 18f2abd8859..f524674cabc 100644 --- a/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_eclipseShm_c +++ b/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_eclipseShm_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-features_org_eclipse_platform_launchers_library_eclipseShm_c,v 1.1 2005/08/09 14:49:09 kurt Exp $ ---- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig Thu Jul 28 12:41:58 2005 -+++ features/org.eclipse.platform.launchers/library/eclipseShm.c Thu Jul 28 12:42:18 2005 -@@ -182,11 +182,11 @@ int setSharedData(char* id, char* data) +$OpenBSD: patch-features_org_eclipse_platform_launchers_library_eclipseShm_c,v 1.2 2007/04/06 02:16:21 kurt Exp $ +--- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig Thu Sep 21 10:57:25 2006 ++++ features/org.eclipse.platform.launchers/library/eclipseShm.c Thu Apr 5 08:12:49 2007 +@@ -182,11 +182,11 @@ int setSharedData(char* id, char* data) { #else /* Unix like platforms */ diff --git a/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_gtk_build_sh b/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_gtk_build_sh index 93980634241..6d6210742d7 100644 --- a/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_gtk_build_sh +++ b/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_library_gtk_build_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-features_org_eclipse_platform_launchers_library_gtk_build_sh,v 1.2 2006/07/07 01:48:55 kurt Exp $ ---- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig Fri Jun 2 13:32:05 2006 -+++ features/org.eclipse.platform.launchers/library/gtk/build.sh Tue Jun 6 23:27:22 2006 +$OpenBSD: patch-features_org_eclipse_platform_launchers_library_gtk_build_sh,v 1.3 2007/04/06 02:16:21 kurt Exp $ +--- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig Thu Sep 21 10:57:25 2006 ++++ features/org.eclipse.platform.launchers/library/gtk/build.sh Thu Apr 5 08:12:49 2007 @@ -71,6 +71,23 @@ case $OS in ;; esac @@ -25,7 +25,7 @@ $OpenBSD: patch-features_org_eclipse_platform_launchers_library_gtk_build_sh,v 1 "SunOS") makefile="make_solaris.mak" defaultOS="solaris" -@@ -129,11 +146,11 @@ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT +@@ -129,11 +146,11 @@ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then diff --git a/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_target_build_properties b/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_target_build_properties index 0dd90b41a93..6ee096facc6 100644 --- a/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_target_build_properties +++ b/devel/eclipse/sdk/patches/patch-features_org_eclipse_platform_launchers_target_build_properties @@ -1,6 +1,6 @@ -$OpenBSD: patch-features_org_eclipse_platform_launchers_target_build_properties,v 1.1 2006/07/07 01:48:55 kurt Exp $ ---- features/org.eclipse.platform.launchers/target.build.properties.orig Tue Jun 6 23:24:05 2006 -+++ features/org.eclipse.platform.launchers/target.build.properties Tue Jun 6 23:24:47 2006 +$OpenBSD: patch-features_org_eclipse_platform_launchers_target_build_properties,v 1.2 2007/04/06 02:16:21 kurt Exp $ +--- features/org.eclipse.platform.launchers/target.build.properties.orig Thu Sep 21 10:57:27 2006 ++++ features/org.eclipse.platform.launchers/target.build.properties Thu Apr 5 08:12:49 2007 @@ -20,6 +20,9 @@ root.win32.win32.x86=bin/win32/win32/x86 root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root root.linux.gtk.x86.permissions.755=libcairo-swt.so @@ -11,7 +11,7 @@ $OpenBSD: patch-features_org_eclipse_platform_launchers_target_build_properties, root.macosx.carbon.ppc=bin/carbon/macosx/ppc root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}, ${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName} -@@ -35,6 +38,9 @@ root.solaris.gtk.sparc=bin/gtk/solaris/s +@@ -35,6 +38,9 @@ root.solaris.gtk.sparc=bin/gtk/solaris/sparc root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so diff --git a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom_cpp b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom_cpp index 7acdc338945..a434bb238dc 100644 --- a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom_cpp +++ b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom_cpp,v 1.3 2006/12/13 20:57:16 kurt Exp $ +$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom_cpp,v 1.4 2007/04/06 02:16:21 kurt Exp $ --- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig Thu Sep 21 10:57:23 2006 -+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp Tue Dec 5 12:28:12 2006 ++++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp Thu Apr 5 08:12:50 2007 @@ -85,14 +85,15 @@ fail: } #endif @@ -23,7 +23,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_library_xpcom return rc; } #endif -@@ -109,18 +110,6 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1 +@@ -109,18 +110,6 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile) fail: if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0); XPCOM_NATIVE_EXIT(env, that, NS_1NewLocalFile_FUNC); diff --git a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_swt_internal_mozilla_XPCOM_java b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_swt_internal_mozilla_XPCOM_java index bb6ee47ea5c..1cbdbddd536 100644 --- a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_swt_internal_mozilla_XPCOM_java +++ b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_swt_internal_mozilla_XPCOM_java @@ -1,6 +1,6 @@ -$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_swt_internal_mozilla_XPCOM_java,v 1.1 2006/12/13 20:57:16 kurt Exp $ +$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_swt_internal_mozilla_XPCOM_java,v 1.2 2007/04/06 02:16:21 kurt Exp $ --- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java.orig Thu Sep 21 10:57:23 2006 -+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java Tue Dec 5 12:31:09 2006 ++++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java Thu Apr 5 08:12:50 2007 @@ -89,6 +89,7 @@ public class XPCOM extends Platform { public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3; public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012; @@ -9,7 +9,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_common_org_eclipse_s public static final native void memmove(nsID dest, int /*long*/ src, int nbytes); public static final native void memmove(int /*long*/ dest, nsID src, int nbytes); -@@ -103,9 +104,8 @@ public static final native void memmove( +@@ -103,9 +104,8 @@ public static final native void memmove(int /*long*/ d public static final native void memmove(byte[] dest, char[] src, int nbytes); public static final native int NS_GetComponentManager(int /*long*/[] result); public static final native int NS_GetServiceManager(int /*long*/[] result); diff --git a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_browser_Browser_java b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_browser_Browser_java index 43e645ac1ae..5b6de7f92da 100644 --- a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_browser_Browser_java +++ b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_browser_Browser_java @@ -1,6 +1,6 @@ -$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_browser_Browser_java,v 1.1 2006/12/13 20:57:16 kurt Exp $ +$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_browser_Browser_java,v 1.2 2007/04/06 02:16:21 kurt Exp $ --- plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java.orig Thu Sep 21 10:57:19 2006 -+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java Tue Dec 5 12:30:21 2006 ++++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java Thu Apr 5 08:12:50 2007 @@ -10,16 +10,76 @@ *******************************************************************************/ package org.eclipse.swt.browser; @@ -87,7 +87,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_ /** * Instances of this class implement the browser user interface * metaphor. It allows the user to visualize and navigate through -@@ -169,46 +229,7 @@ public Browser(Composite parent, int sty +@@ -169,46 +229,7 @@ public Browser(Composite parent, int style) { } } @@ -135,7 +135,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_ int /*long*/[] retVal = new int /*long*/[1]; nsEmbedString pathString = new nsEmbedString(mozillaPath); -@@ -218,11 +239,11 @@ public Browser(Composite parent, int sty +@@ -218,11 +239,11 @@ public Browser(Composite parent, int style) { if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER); nsILocalFile localFile = new nsILocalFile(retVal[0]); @@ -149,7 +149,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_ } rc = XPCOM.NS_GetComponentManager(result); -@@ -283,7 +304,6 @@ public Browser(Composite parent, int sty +@@ -283,7 +304,6 @@ public Browser(Composite parent, int style) { rc = properties.Get(buffer, nsIFile.NS_IFILE_IID, result); if (rc != XPCOM.NS_OK) error(rc); if (result[0] == 0) error(XPCOM.NS_NOINTERFACE); @@ -157,7 +157,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_Mozilla_gtk_org_eclipse_swt_ nsIFile profileDir = new nsIFile(result[0]); result[0] = 0; -@@ -305,24 +325,15 @@ public Browser(Composite parent, int sty +@@ -305,24 +325,15 @@ public Browser(Composite parent, int style) { pathString.dispose(); // profileDir = new nsIFile(result[0]); diff --git a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak index 3cd0c2229ca..42f645c976e 100644 --- a/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak +++ b/devel/eclipse/sdk/patches/patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak @@ -1,7 +1,7 @@ -$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_mak,v 1.5 2006/12/13 20:57:16 kurt Exp $ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_openbsd.mak.orig Mon Dec 4 22:29:12 2006 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_openbsd.mak Tue Dec 5 11:22:03 2006 -@@ -30,18 +30,18 @@ PROFILE17_PREFIX = swt-mozilla17-profile +$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 $ +--- 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) PROFILE18_PREFIX = swt-mozilla18-profile$(GCC_VERSION) GLX_PREFIX = swt-glx @@ -29,6 +29,15 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_ CAIROCFLAGS = `pkg-config --cflags cairo` CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo +@@ -80,7 +80,7 @@ MOZILLACFLAGS = -O \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/openbsd \ + ${SWT_PTR_CFLAGS} +-MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ++MOZILLALIBS = -shared -fPIC -s -Wl,--version-script=mozilla_exports -Bsymbolic + + SWT_OBJECTS = swt.o callback.o + CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o @@ -101,12 +101,13 @@ CFLAGS = -O -Wall \ -DLINUX -DGTK \ -I$(JAVA_HOME)/include \ @@ -44,7 +53,7 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_make_openbsd_ # # SWT libs -@@ -202,7 +203,7 @@ gnome_stats.o: gnome_stats.c gnome_stats +@@ -202,7 +203,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h # # Mozilla lib # diff --git a/devel/eclipse/sdk/patches/patch-too_long_XPCOM_properties b/devel/eclipse/sdk/patches/patch-too_long_XPCOM_properties index cb29ec38e5e..2b7beaf33f6 100644 --- a/devel/eclipse/sdk/patches/patch-too_long_XPCOM_properties +++ b/devel/eclipse/sdk/patches/patch-too_long_XPCOM_properties @@ -1,7 +1,7 @@ -$OpenBSD: patch-too_long_XPCOM_properties,v 1.1 2006/12/13 20:57:16 kurt Exp $ ---- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties.orig Tue Dec 5 11:49:02 2006 -+++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties Tue Dec 5 12:32:13 2006 -@@ -24,16 +24,15 @@ XPCOM_NS_GetComponentManager_0=cast=(nsI +$OpenBSD: patch-too_long_XPCOM_properties,v 1.2 2007/04/06 02:16:21 kurt Exp $ +--- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties.orig Thu Sep 21 10:55:43 2006 ++++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties Thu Apr 5 08:12:52 2007 +@@ -24,16 +24,15 @@ XPCOM_NS_GetComponentManager_0=cast=(nsIComponentManag XPCOM_NS_GetServiceManager= XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)