Accepting request 71526 from Publishing

Drop openjade-1.3-starlink-0.1.patch and valid_fo_patch2.gz: unused patches (forwarded request 71522 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/71526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openjade?expand=0&rev=11

gcc46_default_ctors.patch

@@ -0,0 +1,74 @@
+--- jade/TeXFOTBuilder.cxx	2011-05-10 21:01:33.769789341 +0200
++++ jade/TeXFOTBuilder.cxx	2011-05-10 21:05:04.142897135 +0200
+@@ -75,6 +75,8 @@
+     virtual void end(TeXFOTBuilder &) const = 0;
+   };
+   class PageFloatFlowObj : public TeXCompoundExtensionFlowObj {
++  public:
++    PageFloatFlowObj() {}
+     void start(TeXFOTBuilder &fotb, const NodePtr &) const {
+       fotb.startPageFloat(nic_);
+     }
+@@ -94,6 +96,8 @@
+     StringC placement;
+   };
+   class PageFootnoteFlowObj : public TeXCompoundExtensionFlowObj {
++  public:
++    PageFootnoteFlowObj() {}
+     void start(TeXFOTBuilder &fotb, const NodePtr &) const {
+       fotb.startPageFootnote();
+     }
+--- jade/TransformFOTBuilder.cxx.orig	2011-05-10 21:18:33.554680483 +0200
++++ jade/TransformFOTBuilder.cxx	2011-05-10 21:24:23.456887213 +0200
+@@ -41,6 +41,7 @@
+   };
+   class EntityRefFlowObj : public TransformExtensionFlowObj {
+   public:
++    EntityRefFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.entityRef(name_);
+     }
+@@ -56,6 +57,7 @@
+   };
+   class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
+   public:
++    ProcessingInstructionFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.processingInstruction(data_);
+     }
+@@ -70,6 +72,8 @@
+     StringC data_;
+   };
+   class EmptyElementFlowObj : public TransformExtensionFlowObj {
++  public:
++    EmptyElementFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+       if (nic_.gi.size() > 0)
+ 	fotb.emptyElement(nic_);
+@@ -102,6 +106,8 @@
+     ElementNIC nic_;
+   };
+   class ElementFlowObj : public TransformCompoundExtensionFlowObj {
++  public:
++    ElementFlowObj() {}
+     void start(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+       if (nic_.gi.size() > 0)
+ 	fotb.startElement(nic_);
+@@ -137,6 +143,8 @@
+     ElementNIC nic_;
+   };
+   class EntityFlowObj : public TransformCompoundExtensionFlowObj {
++  public:
++    EntityFlowObj() {}
+     void start(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.startEntity(systemId_);
+     }
+@@ -154,6 +162,8 @@
+     StringC systemId_;
+   };
+   class DocumentTypeFlowObj : public TransformExtensionFlowObj {
++  public:
++    DocumentTypeFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const {
+       fotb.documentType(nic_);
+     }

openjade.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May 26 11:19:51 UTC 2011 - idonmez@novell.com
+
+- Drop unapplied openjade-1.3-starlink-0.1.patch and
+  valid_fo_patch2.gz patches
+
+-------------------------------------------------------------------
+Tue May 10 19:32:22 UTC 2011 - cgiboudeaux@gmx.com
+
+- Add gcc46_default-ctors.patch. Adds the missing ctors to build with gcc 4.6
+
 -------------------------------------------------------------------
 Mon Jan 14 13:32:27 CET 2008 - crrodriguez@suse.de
 

openjade.spec

@@ -28,11 +28,10 @@ Summary:        DSSSL Engine for SGML Documents
 Source:         http://switch.dl.sourceforge.net/sourceforge/openjade/openjade-1.3.2.tar.bz2
 Source1:        jade_style-sheet.dtd
 Source2:        %{name}-README.SuSE
-Patch:          openjade-1.3.1-autoconf.dif
-Patch3:         http://www.astro.gla.ac.uk/users/norman/distrib/openjade-1.3-starlink-0.1.patch
-Patch4:         openjade-1.3.2-makefile.patch
-Patch5:         valid_fo_patch2.gz
-Patch6:         openjade-1.3.2-shared.patch
+Patch1:          openjade-1.3.1-autoconf.dif
+Patch2:         openjade-1.3.2-makefile.patch
+Patch3:         openjade-1.3.2-shared.patch
+Patch4:         gcc46_default_ctors.patch
 # Conflicts: jade_dsl
 Obsoletes:      jade_dsl
 Provides:       jade jade_dsl
@@ -106,10 +105,10 @@ Authors:
 # -n %{name}-1.3.2-rc2
 cp %{S:1} dsssl
 cp %{S:2} README.SuSE
-%patch -b .autoconf
-# %setup -n jade-1.2.1 -b 1 -T -D
-%patch4 -p 1 -b .makefile
-%patch6
+%patch1
+%patch2 -p1
+%patch3
+%patch4
 
 %build
 # export CXXFLAGS='-O'

valid_fo_patch2.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:088223fd59c533ebd154e2abe7a5aeb5c718842b97216953136a9e18f28e78cb
-size 17074