Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 01 Aug 2003 17:02:00 +0200
From:      Jens Rehsack <rehsack@liwing.de>
To:        Kirill Ponomarew <krion@FreeBSD.org>
Cc:        openoffice@FreeBSD.org
Subject:   Re: ports/55147: Openoffice build failure
Message-ID:  <3F2A80E8.8050806@liwing.de>
In-Reply-To: <200308011402.h71E2JZE041087@freefall.freebsd.org>
References:  <200308011402.h71E2JZE041087@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------030000070804060205030701
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

On 01.08.2003 16:02, Kirill Ponomarew wrote:
> Synopsis: Openoffice build failure
> 
> Responsible-Changed-From-To: freebsd-ports-bugs->openoffice 
> Responsible-Changed-By: krion
> Responsible-Changed-When: Fri Aug 1 07:01:27 PDT 2003
> Responsible-Changed-Why: 
> Over to maintainer.
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=55147

Attached patch works around the problem for me, but is followed
by the always loved "wchar.h" missing in stlport (builtin-4.5)
and ports one.

Would be glad to hear more from submitter.

Jens

--------------030000070804060205030701
Content-Type: text/plain;
 name="patch-openoffice-mozilla"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch-openoffice-mozilla"

Index: mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_util.c
===================================================================
diff -u mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_util.c.orig mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_util.c
--- mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_util.c.orig	Thu Jul 31 09:33:54 2003
+++ mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_util.c	Thu Jul 31 09:44:39 2003
@@ -824,10 +824,10 @@
             iter = IDL_LIST(iter).next) {
             if (IDL_tree_property_get(
                 IDL_INTERFACE(iter).ident, "scriptable") == 0) {
-                XPIDL_WARNING((interface_tree,IDL_WARNING1,
+                XPIDL_WARNING(interface_tree,IDL_WARNING1,
                     "%s is scriptable but inherits from the non-scriptable interface %s\n",
                     IDL_IDENT(IDL_INTERFACE(interface_tree).ident).str,
-                    IDL_IDENT(IDL_INTERFACE(iter).ident).str));
+                    IDL_IDENT(IDL_INTERFACE(iter).ident).str);
             }
         }
     }
Index: mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl.h
===================================================================
diff -u mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl.h.orig mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl.h
--- mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl.h.orig	Wed Apr 10 03:38:31 2002
+++ mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl.h	Thu Jul 31 09:34:30 2003
@@ -71,10 +71,10 @@
  * parens, e.g. XPIDL_WARNING((foo, bar, "sil"))
  *
  * Probably best removed when we leave 6.5.  */
-#define XPIDL_WARNING(x) IDL_tree_warning##x
+#define XPIDL_WARNING IDL_tree_warning
 #else
 extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...);
-#define XPIDL_WARNING(x) xpidl_tree_warning##x
+#define XPIDL_WARNING xpidl_tree_warning
 #endif
 
 /*
Index: mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_header.c
===================================================================
diff -u mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_header.c.orig mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_header.c
--- mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_header.c.orig	Wed Apr 10 03:38:32 2002
+++ mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_header.c	Thu Jul 31 09:59:29 2003
@@ -317,12 +317,12 @@
             continue;
 
           case IDLN_CODEFRAG:
-            XPIDL_WARNING((iter, IDL_WARNING1,
+            XPIDL_WARNING(iter, IDL_WARNING1,
                            "%%{ .. %%} code fragment within interface "
                            "ignored when generating NS_DECL_%s macro; "
                            "if the code fragment contains method "
                            "declarations, the macro probably isn't "
-                           "complete.", classNameUpper));
+                           "complete.", classNameUpper);
             continue;
 
           default:
@@ -793,9 +793,9 @@
      * are legal IDL... but we don't do anything with 'em.
      */
     if (IDL_LIST(IDL_ATTR_DCL(state->tree).simple_declarations).next != NULL) {
-        XPIDL_WARNING((state->tree, IDL_WARNING1,
+        XPIDL_WARNING(state->tree, IDL_WARNING1,
                        "multiple attributes in a single declaration aren't "
-                       "currently supported by xpidl"));
+                       "currently supported by xpidl");
     }
 
     xpidl_write_comment(state, 2);
@@ -865,8 +865,8 @@
     GSList *doc_comments;
 
     if (IDL_NODE_TYPE(type) == IDLN_TYPE_SEQUENCE) {
-        XPIDL_WARNING((state->tree, IDL_WARNING1,
-                       "sequences not supported, ignored"));
+        XPIDL_WARNING(state->tree, IDL_WARNING1,
+                       "sequences not supported, ignored");
     } else {
         if (IDL_NODE_TYPE(complex = IDL_LIST(dcls).data) == IDLN_TYPE_ARRAY) {
             IDL_tree dim = IDL_TYPE_ARRAY(complex).size_list;
@@ -1136,9 +1136,9 @@
     guint fragment_length;
     
     if (strcmp(desc, "C++") && /* libIDL bug? */ strcmp(desc, "C++\r")) {
-        XPIDL_WARNING((state->tree, IDL_WARNING1,
+        XPIDL_WARNING(state->tree, IDL_WARNING1,
                        "ignoring '%%{%s' escape. "
-                       "(Use '%%{C++' to escape verbatim C++ code.)", desc));
+                       "(Use '%%{C++' to escape verbatim C++ code.)", desc);
 
         return TRUE;
     }
Index: mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_java.c
===================================================================
diff -u mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_java.c.orig mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_java.c.orig	Wed Apr 10 03:38:32 2002
+++ mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_java.c	Thu Jul 31 09:34:30 2003
@@ -669,9 +669,9 @@
 static gboolean
 enum_declaration(TreeState *state)
 {
-    XPIDL_WARNING((state->tree, IDL_WARNING1,
+    XPIDL_WARNING(state->tree, IDL_WARNING1,
                    "enums not supported, enum \'%s\' ignored",
-                   IDL_IDENT(IDL_TYPE_ENUM(state->tree).ident).str));
+                   IDL_IDENT(IDL_TYPE_ENUM(state->tree).ident).str);
     return TRUE;
 }
 
Index: mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c
===================================================================
diff -u mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c.orig mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c
--- mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c.orig	Wed Apr 10 03:38:32 2002
+++ mozilla/work/mozilla/xpcom/typelib/xpidl/xpidl_typelib.c	Thu Jul 31 09:34:30 2003
@@ -1196,9 +1196,9 @@
 static gboolean
 typelib_enum(TreeState *state)
 {
-    XPIDL_WARNING((state->tree, IDL_WARNING1,
+    XPIDL_WARNING(state->tree, IDL_WARNING1,
                    "enums not supported, enum \'%s\' ignored",
-                   IDL_IDENT(IDL_TYPE_ENUM(state->tree).ident).str));
+                   IDL_IDENT(IDL_TYPE_ENUM(state->tree).ident).str);
     return TRUE;
 }
 

--------------030000070804060205030701--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F2A80E8.8050806>