diff options
Diffstat (limited to 'x11-toolkits/swt-devel/files/patch-make_freebsd.mak')
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-make_freebsd.mak | 157 |
1 files changed, 0 insertions, 157 deletions
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} |