diff options
Diffstat (limited to 'x11-toolkits/swt-devel/files')
| -rw-r--r-- | x11-toolkits/swt-devel/files/build.xml | 67 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-OS.java | 26 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-build.sh | 101 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-make_freebsd.mak | 157 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java | 14 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-os.c | 20 |
6 files changed, 0 insertions, 385 deletions
diff --git a/x11-toolkits/swt-devel/files/build.xml b/x11-toolkits/swt-devel/files/build.xml deleted file mode 100644 index 62a15f50581c..000000000000 --- a/x11-toolkits/swt-devel/files/build.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Copyright (c) 2009 IBM Corporation and others. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html - - Contributors: - IBM Corporation - initial API and implementation - --> -<project name="org.eclipse.swt.gtk.freebsd.%%ARCH%%" default="build.jar" basedir="."> - - <target name="init"> - <property name="ws" value="gtk"/> - <property name="os" value="freebsd"/> - <property name="destination" value="${basedir}"/> - <property name="javac.verbose" value="false"/> - <property name="javac.debug" value="off"/> - <property name="input.srcdir" value="${basedir}/org"/> - <property name="output.jar" value="${basedir}/%%OUTPUT_JAR%%"/> - <property name="output.classes" value="${basedir}/classes"/> - </target> - - <target name="all" depends="build.jar"/> - - <target name="build.classes" depends="init"> - <mkdir dir="${output.classes}"/> - <javac srcdir="${input.srcdir}" destdir="${output.classes}" - debug="${javac.debug}" verbose="${javac.verbose}" - source="1.4" target="1.4"> - </javac> - </target> - - <target name="build.jar" depends="build.nativeLibraries"> - <jar destfile="${output.jar}" index="false"> - <fileset dir="${output.classes}"> - <exclude name="**/*.java"/> - <exclude name="**/*.o"/> - <exclude name="**/*.so"/> - <!-- exclude CVS archive --> - <exclude name="**/CVS/**"/> - </fileset> - <fileset dir="${basedir}"> - <include name="**/version.txt"/> - <include name="**/*.properties"/> - </fileset> - </jar> - </target> - - <target name="clean" depends="init"> - <delete dir="${output.classes}"/> - <delete file="${output.jar}"/> - <exec executable="sh" failonerror="true"> - <arg value="build.sh"/> - <arg value="clean"/> - </exec> - </target> - - <target name="build.nativeLibraries" depends="build.classes"> - <exec executable="sh" failonerror="true"> - <arg value="build.sh"/> - </exec> - </target> - -</project> diff --git a/x11-toolkits/swt-devel/files/patch-OS.java b/x11-toolkits/swt-devel/files/patch-OS.java deleted file mode 100644 index 04dd3008d213..000000000000 --- a/x11-toolkits/swt-devel/files/patch-OS.java +++ /dev/null @@ -1,26 +0,0 @@ ---- ./org/eclipse/swt/internal/gtk/OS.java.orig Thu Dec 15 15:19:38 2005 -+++ ./org/eclipse/swt/internal/gtk/OS.java Mon Jan 23 23:51:20 2006 -@@ -20,18 +20,20 @@ - } - - /** OS Constants */ -- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX; -+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD; - static { - - /* Initialize the OS flags and locale constants */ -+ /* make bootstrap compatible with `uname -s` for FreeBSD */ - String osName = System.getProperty ("os.name"); -- boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false; -+ boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isFreeBSD = false; - if (osName.equals ("Linux")) isLinux = true; -+ if (osName.equals ("FreeBSD")) isFreeBSD = true; - if (osName.equals ("AIX")) isAIX = true; - if (osName.equals ("Solaris")) isSunOS = true; - if (osName.equals ("SunOS")) isSunOS = true; - if (osName.equals ("HP-UX")) isHPUX = true; -- IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; -+ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsFreeBSD = isFreeBSD; IsHPUX = isHPUX; - } - - /** Constants */ diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh deleted file mode 100644 index 9a0218724f76..000000000000 --- a/x11-toolkits/swt-devel/files/patch-build.sh +++ /dev/null @@ -1,101 +0,0 @@ ---- build.sh.orig 2011-11-02 21:46:45.000000000 -0500 -+++ build.sh 2011-11-02 21:46:57.000000000 -0500 -@@ -54,6 +54,9 @@ - "FreeBSD") - SWT_OS=freebsd - MAKEFILE=make_freebsd.mak -+ if uname -p > /dev/null 2>&1; then -+ MODEL=`uname -p` -+ fi - ;; - *) - SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` -@@ -92,10 +95,10 @@ - esac - echo "Model is ${MODEL}" - # For 64-bit CPUs, we have a switch --if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then -+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then - SWT_PTR_CFLAGS=-DJNI64 - if [ -d /lib64 ]; then -- XLIB64=-L/usr/X11R6/lib64 -+ XLIB64=-L${LOCALBASE}/lib64 - export XLIB64 - fi - if [ ${MODEL} = 'ppc64' ]; then -@@ -131,6 +134,7 @@ - export SWT_LFLAGS SWT_PTR_CFLAGS - fi - -+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" -a ${MODEL} != "sparc64" ]; then - echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" - MAKE_GNOME=make_gnome -@@ -138,7 +142,9 @@ - echo "libgnome-2.0 and libgnomeui-2.0 not found:" - echo " *** SWT Program support for GNOME will not be compiled." - fi -+fi - -+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 -@@ -146,40 +152,28 @@ - echo "Cairo not found:" - echo " *** Advanced graphics support using cairo will not be compiled." - fi -- --if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; 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 -- XULRUNNER_INCLUDES=`pkg-config --cflags libxul` -- XULRUNNER_LIBS=`pkg-config --libs libxul` -- export XULRUNNER_INCLUDES -- export XULRUNNER_LIBS -- MAKE_MOZILLA=make_xulrunner -- else -- echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" -- echo " *** Mozilla embedding support will not be compiled." -- 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 -+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then -+ echo "Using libxul for gecko support" -+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding` -+ XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding` -+ export XULRUNNER_INCLUDES -+ export XULRUNNER_LIBS - else -- echo "WebKit not found:" -- echo " *** WebKit embedding support will not be compiled." -+ echo "None of the following libraries were found: XULRunner/XPCOM" -+ echo " *** Mozilla embedding support will not be compiled." - 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, causes build to fail." -+ echo " *** (temporary workaround until a better solution can be found)" -+#fi -+ - # Find AWT if available - if [ -z "${AWT_LIB_PATH}" ]; then - if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak deleted file mode 100644 index e0928f670dd3..000000000000 --- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak +++ /dev/null @@ -1,157 +0,0 @@ ---- make_freebsd.mak.orig 2011-02-10 17:29:10.000000000 +0000 -+++ make_freebsd.mak 2011-10-01 22:28:43.000000000 +0000 -@@ -9,7 +9,7 @@ - # IBM Corporation - initial API and implementation - #******************************************************************************* - --# Makefile for creating SWT libraries for Linux GTK -+# Makefile for creating SWT libraries for FreeBSD GTK - - include make_common.mak - -@@ -46,7 +46,7 @@ - - # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) - GTKCFLAGS = `pkg-config --cflags gtk+-2.0` --GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst - - CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc - -@@ -59,7 +59,8 @@ - GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` - GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - --GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXCFLAGS = -I$(LOCALBASE)/include -+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm - - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS -@@ -78,6 +79,17 @@ - -I$(JAVA_HOME)/include/freebsd \ - ${SWT_PTR_CFLAGS} - MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic -+ -+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -+ -DNO__1XPCOMGlueStartup \ -+ -DNO__1XPCOMGlueLoadXULFunctions \ -+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \ -+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \ -+ -DNO_nsDynamicFunctionLoad_1sizeof \ -+ -DNO__1Call__IIIIII \ -+ -DNO__1Call__JJJJJI \ -+ -DNO_nsDynamicFunctionLoad -+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 - - SWT_OBJECTS = swt.o c.o c_stats.o callback.o - CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o -@@ -87,7 +99,7 @@ - ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o - GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o - MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o --XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o -+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - -@@ -95,19 +107,20 @@ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DFREEBSD -DGTK \ -+ -I$(LOCALBASE)/include \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ - -fPIC \ - ${SWT_PTR_CFLAGS} - LFLAGS = -shared -fPIC - --ifndef NO_STRIP -- AWT_LFLAGS := $(AWT_LFLAGS) -s -- MOZILLALFLAGS := $(MOZILLALFLAGS) -s -- LFLAGS := $(LFLAGS) -s --endif -+.ifndef NO_STRIP -+AWT_LFLAGS := $(AWT_LFLAGS) -s -+MOZILLALFLAGS := $(MOZILLALFLAGS) -s -+LFLAGS := $(LFLAGS) -s -+.endif - --all: make_swt make_atk make_gnome make_glx -+all: make_swt make_atk make_glx - - # - # SWT libs -@@ -161,7 +174,7 @@ - # - # AWT lib - # --make_awt:$(AWT_LIB) -+make_awt: $(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -@@ -203,19 +216,19 @@ - # - # Mozilla lib - # --make_mozilla:$(MOZILLA_LIB) -+make_mozilla: $(MOZILLA_LIB) - - $(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp - - xpcom_structs.o: xpcom_structs.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp - - xpcom_custom.o: xpcom_custom.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp - - xpcom_stats.o: xpcom_stats.cpp - $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp -@@ -223,33 +236,27 @@ - # - # XULRunner lib - # --make_xulrunner:$(XULRUNNER_LIB) -+make_xulrunner: $(XULRUNNER_LIB) - - $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp -- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp -+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp - - xpcomxul_structs.o: xpcom_structs.cpp -- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp -+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp - - xpcomxul_custom.o: xpcom_custom.cpp -- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp -+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp - - xpcomxul_stats.o: xpcom_stats.cpp -- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp -- --xpcomxulglue.o: xpcomglue.cpp -- $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp -- --xpcomxulglue_stats.o: xpcomglue_stats.cpp -- $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp -+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp - - # - # XPCOMInit lib - # --make_xpcominit:$(XPCOMINIT_LIB) -+make_xpcominit: $(XPCOMINIT_LIB) - - $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} diff --git a/x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java b/x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java deleted file mode 100644 index cfa060d3fb72..000000000000 --- a/x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java +++ /dev/null @@ -1,14 +0,0 @@ ---- org/eclipse/swt/internal/C.java.orig 2009-07-11 08:21:27.000000000 -0500 -+++ org/eclipse/swt/internal/C.java 2009-07-11 08:22:21.000000000 -0500 -@@ -13,9 +13,9 @@ - public class C extends Platform { - - static { -- if ("Linux".equals (System.getProperty ("os.name")) && "motif".equals (Platform.PLATFORM)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ -+ if ("FreeBSD".equals (System.getProperty ("os.name")) && "motif".equals (Platform.PLATFORM)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - try { -- Library.loadLibrary ("libXm.so.2", false); //$NON-NLS-1$ -+ Library.loadLibrary ("libXm.so.3", false); //$NON-NLS-1$ - } catch (Throwable ex) {} - } - Library.loadLibrary ("swt"); //$NON-NLS-1$ diff --git a/x11-toolkits/swt-devel/files/patch-os.c b/x11-toolkits/swt-devel/files/patch-os.c deleted file mode 100644 index ad5cc50177bc..000000000000 --- a/x11-toolkits/swt-devel/files/patch-os.c +++ /dev/null @@ -1,20 +0,0 @@ ---- os.c.orig 2008-12-31 16:16:39.000000000 -0500 -+++ os.c 2008-12-31 16:20:29.000000000 -0500 -@@ -18036,11 +18036,16 @@ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, realpath_FUNC); - if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg1) { -+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ } else -+ lparg1 = malloc(PATH_MAX); - rc = (jintLong)realpath((const char *)lparg0, (char *)lparg1); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); -+ if (!arg1 && lparg1 && rc == 0) -+ free(lparg1); - OS_NATIVE_EXIT(env, that, realpath_FUNC); - return rc; - } |