ports/161789: Openoffice.org-3 compilations fails in module vcl

[Pim van Grol]

>Number:         161789
>Category:       ports
>Synopsis:       Openoffice.org-3 compilations fails in module vcl
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 18 23:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Pim van Grol
>Release:        FreeBSD 8-STABLE
>Organization:
>Environment:
FreeBSD ph01.pims.net 8.2-STABLE FreeBSD 8.2-STABLE #0 r226381: Sat Oct 15 12:36:59 CEST 2011     pim at ph01.pims.net:/usr/obj/usr/src/sys/PH01  amd64
>Description:
Openoffice.org-3 compilation fails with:

ERROR: error 65280 occurred while making /usr/ports/editors/openoffice.org-3/work/OOO330_m20/vcl/unx/source/app

Attention: if you fix the errors in above module(s) you may prolongue your the build issuing command:

        build --from vcl

*** Error code 1

Stop in /usr/ports/editors/openoffice.org-3.
>How-To-Repeat:
Repeat the build. May only happen when the vcl plugin is selected, I have not tried without that plugin.
>Fix:
Following patches resolved it for me:

--- vcl/unx/inc/dtint.hxx.orig	2011-10-18 20:08:21.896918472 +0200
+++ vcl/unx/inc/dtint.hxx	2011-10-18 20:09:51.328361016 +0200
@@ -36,7 +36,7 @@
 class SalDisplay;
 class AllSettings;
 
-#ifndef _XLIB_H_
+#ifndef _X11_XLIB_H_
 // forwards from X
 struct Display;
 struct XEvent;

--- vcl/unx/inc/xfont.hxx.orig	2011-10-18 20:08:39.487211931 +0200
+++ vcl/unx/inc/xfont.hxx	2011-10-18 20:10:07.168615014 +0200
@@ -27,7 +27,7 @@
 #ifndef EXTENDED_FONTSTRUCT_HXX
 #define EXTENDED_FONTSTRUCT_HXX
 
-#ifndef _XLIB_H_
+#ifndef _X11_XLIB_H_
 #include <tools/prex.h>
 #include <X11/Xlib.h>
 #include <tools/postx.h>


>Release-Note:
>Audit-Trail:
>Unformatted: