diff options
| author | aymeric <aymeric@pkgsrc.org> | 2011-02-26 16:02:39 +0000 |
|---|---|---|
| committer | aymeric <aymeric@pkgsrc.org> | 2011-02-26 16:02:39 +0000 |
| commit | 728c66fa5284151b4d55f1445a1d1a21a739faab (patch) | |
| tree | ef9c3f06e9c58bc1343419dbbfe0bd10f6945c65 /misc/openoffice3 | |
| parent | 957a9a1e1d38ae47fd56a9e0fee4779037661476 (diff) | |
| download | pkgsrc-728c66fa5284151b4d55f1445a1d1a21a739faab.tar.gz | |
Allow building with new X11/Xlib.h. Patch from upstream, see OpenOffice
bug report 115871; adapted for vcl/unx/inc/xfont.hxx
Diffstat (limited to 'misc/openoffice3')
| -rw-r--r-- | misc/openoffice3/distinfo | 4 | ||||
| -rw-r--r-- | misc/openoffice3/patches/patch-ha | 25 | ||||
| -rw-r--r-- | misc/openoffice3/patches/patch-hb | 21 |
3 files changed, 49 insertions, 1 deletions
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 3805638d0d3..75890b0084b 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2010/06/03 07:58:37 tnn Exp $ +$NetBSD: distinfo,v 1.28 2011/02/26 16:02:39 aymeric 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 @@ -93,3 +93,5 @@ SHA1 (patch-ek) = 8539878661657b9c5a84e7084ab7289cd26f859f SHA1 (patch-ga) = bc76285681afe91b48399e0886344925d9086b5d SHA1 (patch-gb) = 70c11692129ef17cf47afa8dbff25e5e41719599 SHA1 (patch-gc) = 51c00c2fbb64c299d528c072fe68e1f9786a0fff +SHA1 (patch-ha) = 174125037d080b5bb61c1565520d72556cd3a7e5 +SHA1 (patch-hb) = 31de8d81c05d974d58599d8ff20bd60101b4a143 diff --git a/misc/openoffice3/patches/patch-ha b/misc/openoffice3/patches/patch-ha new file mode 100644 index 00000000000..c2d2343324f --- /dev/null +++ b/misc/openoffice3/patches/patch-ha @@ -0,0 +1,25 @@ +$NetBSD: patch-ha,v 1.1 2011/02/26 16:02:39 aymeric Exp $ + +--- vcl/unx/inc/dtint.hxx.orig 2008-04-11 09:32:48.000000000 +0000 ++++ vcl/unx/inc/dtint.hxx +@@ -34,19 +34,12 @@ + #include <tools/string.hxx> + #include <tools/color.hxx> + #include <vcl/font.hxx> ++#include "svunx.h" + + class SalBitmap; + class SalDisplay; + class AllSettings; + +-#ifndef _XLIB_H_ +-// forwards from X +-struct Display; +-struct XEvent; +-#define Atom UINT32 +-#define XLIB_Window UINT32 +-#endif +- + enum DtType { + DtGeneric, + DtCDE, diff --git a/misc/openoffice3/patches/patch-hb b/misc/openoffice3/patches/patch-hb new file mode 100644 index 00000000000..634f3437aa0 --- /dev/null +++ b/misc/openoffice3/patches/patch-hb @@ -0,0 +1,21 @@ +$NetBSD: patch-hb,v 1.1 2011/02/26 16:02:39 aymeric Exp $ + +--- vcl/unx/inc/xfont.hxx.orig 2008-04-11 09:42:14.000000000 +0000 ++++ vcl/unx/inc/xfont.hxx +@@ -30,15 +30,11 @@ + #ifndef EXTENDED_FONTSTRUCT_HXX + #define EXTENDED_FONTSTRUCT_HXX + +-#ifndef _XLIB_H_ +-#include <prex.h> +-#include <X11/Xlib.h> +-#include <postx.h> +-#endif + #include <tools/ref.hxx> + #include <rtl/tencinfo.h> + #include <vcl/vclenum.hxx> + #include <vcl/sallayout.hxx> ++#include "svunx.h" + + typedef unsigned short sal_MultiByte; + |