diff options
| author | tnn <tnn@pkgsrc.org> | 2009-09-19 11:06:53 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-09-19 11:06:53 +0000 |
| commit | d9f3e29cab0e2b214e1056d33afceb0f798d7978 (patch) | |
| tree | 281a47ae75cde7285579eeadf681165e0ef18433 /misc/openoffice3 | |
| parent | 9f695daf42a315b98921f417a80f0fdb630a1d83 (diff) | |
| download | pkgsrc-d9f3e29cab0e2b214e1056d33afceb0f798d7978.tar.gz | |
patch away more conflicting typedefs in
extensions/source/nsplugin/source/npshell.cxx
Diffstat (limited to 'misc/openoffice3')
| -rw-r--r-- | misc/openoffice3/distinfo | 3 | ||||
| -rw-r--r-- | misc/openoffice3/patches/patch-ae | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index a3455cc51f9..65b99f15bb1 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2009/09/18 11:38:56 tnn Exp $ +$NetBSD: distinfo,v 1.25 2009/09/19 11:06:53 tnn Exp $ SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0 @@ -19,6 +19,7 @@ SHA1 (patch-aa) = 8561c34e623a4b97d4e6840d8c2af0483f4e21f3 SHA1 (patch-ab) = 454f3a357a8c16a027858ed5c789d29baa8eafcb SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d SHA1 (patch-ad) = 8f7afec29d927db694bf511ffd615fe903cc46dc +SHA1 (patch-ae) = 754b79eaca1dc872d61a7f8fd79d7ee8d0a17b39 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1 diff --git a/misc/openoffice3/patches/patch-ae b/misc/openoffice3/patches/patch-ae new file mode 100644 index 00000000000..9d24b04ff68 --- /dev/null +++ b/misc/openoffice3/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2009/09/19 11:06:53 tnn Exp $ + +--- extensions/source/nsplugin/source/npshell.cxx.orig 2008-07-16 22:13:01.000000000 +0200 ++++ extensions/source/nsplugin/source/npshell.cxx +@@ -79,7 +79,7 @@ + + //http://qa.openoffice.org/issues/show_bug.cgi?id=82545 + //https://bugzilla.mozilla.org/show_bug.cgi?id=241262 +-#ifdef UNIX ++#if 0 /* def UNIX */ /* types provided by nptypes.h */ + # ifndef _UINT32 + # if defined(__alpha) || defined(__LP64__) + typedef unsigned int uint32; |