From 50bace236001754d509f92532d1671e9ea73d06a Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 6 Mar 2004 22:11:08 +0000
Subject: [PATCH] fix build with gcc3

---
 .../openjade/patches/patch-grove_Node_cxx     | 48 +++++++++++++++
 .../patches/patch-include_Attribute_h         | 59 +++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 textproc/openjade/patches/patch-grove_Node_cxx
 create mode 100644 textproc/openjade/patches/patch-include_Attribute_h

diff --git a/textproc/openjade/patches/patch-grove_Node_cxx b/textproc/openjade/patches/patch-grove_Node_cxx
new file mode 100644
index 00000000000..806b47cbe7c
--- /dev/null
+++ b/textproc/openjade/patches/patch-grove_Node_cxx
@@ -0,0 +1,48 @@
+$OpenBSD: patch-grove_Node_cxx,v 1.1 2004/03/06 22:11:08 naddy Exp $
+--- grove/Node.cxx.orig	2004-03-06 22:09:29.000000000 +0100
++++ grove/Node.cxx	2004-03-06 22:10:06.000000000 +0100
+@@ -477,7 +477,7 @@ AccessResult Node::property(ComponentNam
+       ret = getEntityType(type);
+       if (ret == accessOK) {
+ 	switch (type) {
+-#define ENUM(e, E) case EntityType::##e: value.set(ComponentName::id##E); break;
++#define ENUM(e, E) case EntityType::e: value.set(ComponentName::id##E); break;
+ 	  ENUM(text, Text)
+ 	  ENUM(cdata, Cdata)
+ 	  ENUM(sdata, Sdata)
+@@ -497,7 +497,7 @@ AccessResult Node::property(ComponentNam
+       ret = getDeclValueType(type);
+       if (ret == accessOK) {
+ 	switch (type) {
+-#define ENUM(e, E) case DeclValueType::##e: value.set(ComponentName::id##E); break;
++#define ENUM(e, E) case DeclValueType::e: value.set(ComponentName::id##E); break;
+ 	ENUM(cdata, Cdata)
+         ENUM(entity, Entity)
+         ENUM(entities, Entities)
+@@ -527,7 +527,7 @@ AccessResult Node::property(ComponentNam
+       ret = getDefaultValueType(type);
+       if (ret == accessOK) {
+ 	switch (type) {
+-#define ENUM(e, E) case DefaultValueType::##e: value.set(ComponentName::id##E); break;
++#define ENUM(e, E) case DefaultValueType::e: value.set(ComponentName::id##E); break;
+         ENUM(value, Value)
+         ENUM(fixed, Fixed)
+         ENUM(required, Required)
+@@ -547,7 +547,7 @@ AccessResult Node::property(ComponentNam
+       ret = getContentType(type);
+       if (ret == accessOK) {
+ 	switch (type) {
+-#define ENUM(e, E) case ContentType::##e: value.set(ComponentName::id##E); break;
++#define ENUM(e, E) case ContentType::e: value.set(ComponentName::id##E); break;
+         ENUM(cdata, Cdata)
+         ENUM(rcdata, Rcdata)
+         ENUM(empty, Empty)
+@@ -566,7 +566,7 @@ AccessResult Node::property(ComponentNam
+       ret = getConnector(type);
+       if (ret == accessOK) {
+ 	switch (type) {
+-#define ENUM(e, E) case Connector::##e: value.set(ComponentName::id##E); break;
++#define ENUM(e, E) case Connector::e: value.set(ComponentName::id##E); break;
+         ENUM(and_, And)
+         ENUM(or_, Or)
+         ENUM(seq, Seq)
diff --git a/textproc/openjade/patches/patch-include_Attribute_h b/textproc/openjade/patches/patch-include_Attribute_h
new file mode 100644
index 00000000000..b5860dbf011
--- /dev/null
+++ b/textproc/openjade/patches/patch-include_Attribute_h
@@ -0,0 +1,59 @@
+$OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $
+--- include/Attribute.h.orig	1999-05-02 17:36:36.000000000 +0200
++++ include/Attribute.h	2004-03-06 21:59:55.000000000 +0100
+@@ -31,6 +31,27 @@ class AttributeSemantics;
+ class AttributeContext;
+ class Syntax;
+ 
++class SP_API AttributeValue : public Resource {
++public:
++  enum Type {
++    implied,
++    cdata,
++    tokenized
++    };
++  AttributeValue();
++  virtual ~AttributeValue();
++  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
++					    AttributeContext &,
++					    const StringC &,
++					    unsigned &,
++					    unsigned &) const;
++  virtual Type info(const Text *&, const StringC *&) const = 0;
++  virtual const Text *text() const;
++  virtual Boolean recoverUnquoted(const StringC &, const Location &,
++				  AttributeContext &, const StringC &);
++  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
++};
++
+ class SP_API AttributeDefinitionDesc {
+ public:
+   AttributeDefinitionDesc() { }
+@@ -373,27 +394,6 @@ private:
+   ConstPtr<Notation> notation_;
+ };
+ 
+-class SP_API AttributeValue : public Resource {
+-public:
+-  enum Type {
+-    implied,
+-    cdata,
+-    tokenized
+-    };
+-  AttributeValue();
+-  virtual ~AttributeValue();
+-  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
+-					    AttributeContext &,
+-					    const StringC &,
+-					    unsigned &,
+-					    unsigned &) const;
+-  virtual Type info(const Text *&, const StringC *&) const = 0;
+-  virtual const Text *text() const;
+-  virtual Boolean recoverUnquoted(const StringC &, const Location &,
+-				  AttributeContext &, const StringC &);
+-  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
+-};
+-
+ class SP_API ImpliedAttributeValue : public AttributeValue {
+ public:
+   ImpliedAttributeValue();