summaryrefslogtreecommitdiff
path: root/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak
diff options
context:
space:
mode:
authorAlexander Nedotsukov <bland@FreeBSD.org>2005-11-06 12:44:04 +0000
committerAlexander Nedotsukov <bland@FreeBSD.org>2005-11-06 12:44:04 +0000
commitb21cdf2cf2c096329cc0cd9c2b0d87415508b3f2 (patch)
treee5ba9fc53651c97da6b80d4fa552591b16c9cc19 /java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak
parentFix small type in chip name (diff)
Unbreak build with cairo 1.0.
Patch by: Andreas Kohn <andreas@syndrom23.de>
Notes
Notes: svn path=/head/; revision=147440
Diffstat (limited to 'java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak')
-rw-r--r--java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak22
1 files changed, 20 insertions, 2 deletions
diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak
index 967dec3c6db3..e474d7a4ba87 100644
--- a/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak
+++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak
@@ -1,5 +1,14 @@
---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Sat May 14 19:50:23 2005
-+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat May 14 21:24:34 2005
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Sat May 14 19:50:23 2005
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat May 14 21:24:34 2005
+@@ -70,7 +70,7 @@
+ SWT_OBJECTS = swt.o callback.o
+ AWT_OBJECTS = swt_awt.o
+ SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
+-CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o cairo_custom.o
++CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
+ 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
@@ -78,15 +78,16 @@
CFLAGS = -O -Wall \
-DSWT_VERSION=$(SWT_VERSION) \
@@ -21,3 +30,12 @@
#
# SWT libs
+@@ -123,8 +124,6 @@
+
+ cairo.o: cairo.c cairo.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+-cairo_custom.o: cairo_custom.c cairo_structs.h cairo.h swt.h
+- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_custom.c
+ cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_structs.c
+ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h