[SM-Commit] GIT changes to master grimoire by Robin Cook (c707c1cd0efd35eeb60e78f5f5cdef8bd0bd3e00)

Robin Cook scm at sourcemage.org
Wed Aug 17 19:44:28 EDT 2011


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 doc/openjade/HISTORY                        |    3 
 doc/openjade/PRE_BUILD                      |    4 
 doc/openjade/openjade-1.3.2-gcc-4.6-1.patch |  113 ++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+)

New commits:
commit c707c1cd0efd35eeb60e78f5f5cdef8bd0bd3e00
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    openjade: added patch to remove -Werror

diff --git a/doc/openjade/HISTORY b/doc/openjade/HISTORY
index 1f9e80e..2152095 100644
--- a/doc/openjade/HISTORY
+++ b/doc/openjade/HISTORY
@@ -1,3 +1,6 @@
+2011-08-17 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: apply patch to remove -Werror
+
 2008-10-04 Eric Sandall <sandalle at sourcemage.org>
 	* volatiles: Add catalog as volatile
 
diff --git a/doc/openjade/PRE_BUILD b/doc/openjade/PRE_BUILD
index 4ba8b92..dfddac3 100755
--- a/doc/openjade/PRE_BUILD
+++ b/doc/openjade/PRE_BUILD
@@ -1,3 +1,7 @@
 default_pre_build                                       &&
 patch  $SOURCE_DIRECTORY/style/MultiLineInlineNote.cxx  \
        $SCRIPT_DIRECTORY/gcc43.patch
+
+cd $SOURCE_DIRECTORY  &&
+
+patch -p1 < $SCRIPT_DIRECTORY/openjade-1.3.2-gcc-4.6-1.patch
diff --git a/doc/openjade/openjade-1.3.2-gcc-4.6-1.patch b/doc/openjade/openjade-1.3.2-gcc-4.6-1.patch
new file mode 100644
index 0000000..63e32d6
--- /dev/null
+++ b/doc/openjade/openjade-1.3.2-gcc-4.6-1.patch
@@ -0,0 +1,113 @@
+Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
+Date:                    2011-03-30
+Initial Package Version: 1.3.2
+Upstream Status:         Not submitted
+Origin:                  Matt Burgess
+Description:             Fixes compilation issues with GCC-4.6.0.
+
+diff -Naur openjade-1.3.2.orig/jade/TeXFOTBuilder.cxx openjade-1.3.2/jade/TeXFOTBuilder.cxx
+--- openjade-1.3.2.orig/jade/TeXFOTBuilder.cxx	2002-01-15 10:35:37.000000000 +0000
++++ openjade-1.3.2/jade/TeXFOTBuilder.cxx	2011-03-30 09:39:46.000000000 +0000
+@@ -75,6 +75,7 @@
+     virtual void end(TeXFOTBuilder &) const = 0;
+   };
+   class PageFloatFlowObj : public TeXCompoundExtensionFlowObj {
++  public:
+     void start(TeXFOTBuilder &fotb, const NodePtr &) const {
+       fotb.startPageFloat(nic_);
+     }
+@@ -88,12 +89,14 @@
+       value.convertString(nic_.placement);
+       }
+     ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
++    PageFloatFlowObj() {}
+   private:
+     PageFloatNIC nic_;
+     StringC name_;
+     StringC placement;
+   };
+   class PageFootnoteFlowObj : public TeXCompoundExtensionFlowObj {
++  public:
+     void start(TeXFOTBuilder &fotb, const NodePtr &) const {
+       fotb.startPageFootnote();
+     }
+@@ -101,6 +104,7 @@
+       fotb.endPageFootnote();
+     }
+     ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
++    PageFootnoteFlowObj() {}
+   private:
+   };
+   //////////////////////////////////////////////////////////////////////
+diff -Naur openjade-1.3.2.orig/jade/TransformFOTBuilder.cxx openjade-1.3.2/jade/TransformFOTBuilder.cxx
+--- openjade-1.3.2.orig/jade/TransformFOTBuilder.cxx	2002-12-01 14:55:51.000000000 +0000
++++ openjade-1.3.2/jade/TransformFOTBuilder.cxx	2011-03-30 09:38:48.000000000 +0000
+@@ -51,6 +51,7 @@
+       value.convertString(name_);
+     }
+     ExtensionFlowObj *copy() const { return new EntityRefFlowObj(*this); }
++    EntityRefFlowObj() {}
+   private:
+     StringC name_;
+   };
+@@ -66,10 +67,12 @@
+       value.convertString(data_);
+     }
+     ExtensionFlowObj *copy() const { return new ProcessingInstructionFlowObj(*this); }
++    ProcessingInstructionFlowObj() {}
+   private:
+     StringC data_;
+   };
+   class EmptyElementFlowObj : public TransformExtensionFlowObj {
++  public:
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+       if (nic_.gi.size() > 0)
+ 	fotb.emptyElement(nic_);
+@@ -98,10 +101,12 @@
+       }
+     }
+     ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
++    EmptyElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+   class ElementFlowObj : public TransformCompoundExtensionFlowObj {
++  public:
+     void start(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+       if (nic_.gi.size() > 0)
+ 	fotb.startElement(nic_);
+@@ -133,10 +138,12 @@
+       }
+     }
+     ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
++    ElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+   class EntityFlowObj : public TransformCompoundExtensionFlowObj {
++  public:
+     void start(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.startEntity(systemId_);
+     }
+@@ -150,10 +157,12 @@
+       value.convertString(systemId_);
+     }
+     ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
++    EntityFlowObj() {}
+   private:
+     StringC systemId_;
+   };
+   class DocumentTypeFlowObj : public TransformExtensionFlowObj {
++  public:
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+       fotb.documentType(nic_);
+     }
+@@ -174,6 +183,7 @@
+       }
+     }
+     ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
++    DocumentTypeFlowObj() {}
+   private:
+     DocumentTypeNIC nic_;
+   };
+


More information about the SM-Commit mailing list