diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-12 01:04:08 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-12 01:04:08 +0000 |
| commit | 19599e5a4a411a2d56be9c645df2a3d9eb0d4ba3 (patch) | |
| tree | d09f794c6c4092a612ca9d09bf3925389764a92c /editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h | |
| parent | Change the imake-4 dependency to the new date.def file in XFree86 4.3.0. (diff) | |
Update to cws_srx644_ooo11beta. It still doesn't build but this commit will help
to track the things down.
There are known problems with weak symbols and exceptions. Some c++ tools
inside the port will fail if you try to compile.
The cpp_uno bridge has been updated to the latest linux version available.
Added 'make update' target to upgrade the source to the latest version.
Approved by: kris (portmgr)
Notes
Notes:
svn path=/head/; revision=77109
Diffstat (limited to 'editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h index d75cac79f29e..c4e255952fc7 100644 --- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h +++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h @@ -1,6 +1,20 @@ ---- ../sal/osl/unx/system.h.orig Mon Mar 11 01:41:13 2002 -+++ ../sal/osl/unx/system.h Mon Mar 11 01:41:25 2002 -@@ -216,12 +216,9 @@ +--- ../sal/osl/unx/system.h.orig Wed Jun 5 16:24:19 2002 ++++ ../sal/osl/unx/system.h Sun Jan 12 15:48:03 2003 +@@ -205,6 +205,13 @@ + # include <sys/ioctl.h> + # include <sys/time.h> + # include <sys/uio.h> ++# include <sys/exec.h> ++# include <vm/vm.h> ++# include <vm/vm_param.h> ++# include <vm/pmap.h> ++# include <vm/swap_pager.h> ++# include <machine/vmparam.h> ++# include <machine/pmap.h> + # include <sys/un.h> + # include <netinet/tcp.h> + # define IORESOURCE_TRANSFER_BSD +@@ -216,12 +223,13 @@ # elif BYTE_ORDER == PDP_ENDIAN # define _PDP_ENDIAN # endif @@ -10,8 +24,12 @@ -# define NO_PTHREAD_PRIORITY -# define CMD_ARG_PRG __progname -# define CMD_ARG_ENV environ -+# define CMD_ARG_PROC_STREAM -+# define CMD_ARG_PROC_NAME "/proc/%u/cmdline" ++/* __progname isn't sufficient here. We need the full path as well ++ * for e.g. setup and __progname only points to the binary name. ++ */ ++# define CMD_ARG_PRG_IS_DEFINED ++# define CMD_ARG_PRG *((struct ps_strings *)PS_STRINGS)->ps_argvstr ++# define CMD_ARG_ENV environ #endif #ifdef SCO |