diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-31 21:32:38 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-31 21:32:38 +0000 |
| commit | 36f042efc35edfb66fd7804fbc6ee269fb523c66 (patch) | |
| tree | 004fa2554d0efd5791d24fae4c427602a2cedcd0 /editors/openoffice-devel/files | |
| parent | - Update to 3.6 (diff) | |
Update to srx644_ooo20030412.
Notes
Notes:
svn path=/head/; revision=77849
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx | 12 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx b/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx deleted file mode 100644 index b15dbd1d6faf..000000000000 --- a/editors/openoffice-devel/files/patch-gnome+gnome-vfs-filetype-registration.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Tue Mar 11 12:43:34 2003 -+++ ../sysui/unix/office/gnome/gnome-vfs-filetype-registration.cxx Tue Mar 11 12:43:58 2003 -@@ -62,7 +62,9 @@ - #include <stdlib.h> - #include <stdio.h> - #include <dlfcn.h> -+#if !(defined FREEBSD || defined NETBSD) - #include <alloca.h> -+#endif - #include <string.h> - - /* diff --git a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk index ac04cf1d24a3..9da9a684d7c0 100644 --- a/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-devel/files/patch-solenv+inc+unxfbsdi.mk @@ -42,8 +42,9 @@ -CXX= g++ -CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE +-CFLAGS+= -c $(INCLUDE) +# flags for C and C++ Compile - CFLAGS+= -w -c $(INCLUDE) ++CFLAGS+= -w -c $(INCLUDE) CFLAGS+= -I/usr/X11R6/include + +# flags for the C++ Compiler |