Forráskód Böngészése

fix C++ declaration order, gcc3.3 is more pedantic

Michael van Elst 22 éve
szülő
commit
fbdd15be0f
2 módosított fájl, 63 hozzáadás és 3 törlés
  1. 58 0
      opensp/opensp.patch
  2. 5 3
      opensp/opensp.spec

+ 58 - 0
opensp/opensp.patch

@@ -0,0 +1,58 @@
+--- include/Attribute.h.dist	2003-06-27 14:13:01.000000000 +0200
++++ include/Attribute.h	2003-06-27 14:15:54.000000000 +0200
+@@ -31,6 +31,27 @@
+ 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() { }
+@@ -380,27 +401,6 @@
+   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();

+ 5 - 3
opensp/opensp.spec

@@ -33,10 +33,11 @@ Distribution: OpenPKG [PLUS]
 Group:        SGML
 License:      GPL
 Version:      1.5
-Release:      20030307
+Release:      20030627
 
 #   list of sources
 Source0:      http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
+Patch0:       opensp.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -53,10 +54,11 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n OpenSP-%{version}
+    %patch -p0
 
 %build
-    CC="%{l_cc}" \
-    CXX="%{l_cxx}" \
+    CC="/usr/bin/cc" \
+    CXX="/usr/bin/c++" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O}" \
     CPPFLAGS="%{l_cppflags}" \