fix build with gcc46 (upstream bug tracker)
This commit is contained in:
		
							parent
							
								
									b8037595a9
								
							
						
					
					
						commit
						2733ce4b27
					
				
							
								
								
									
										82
									
								
								openjade-1.3.2-gcc46.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										82
									
								
								openjade-1.3.2-gcc46.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,82 @@ | ||||
| If a class or struct has no user-defined default constructor, C++ doesn't | ||||
| allow you to default construct a const instance of it. | ||||
| 
 | ||||
| https://bugs.gentoo.org/358021 | ||||
| http://clang.llvm.org/compatibility.html#default_init_const | ||||
| http://gcc.gnu.org/PR44499 | ||||
| 
 | ||||
| 
 | ||||
| --- a/jade/TeXFOTBuilder.cxx
 | ||||
| +++ b/jade/TeXFOTBuilder.cxx
 | ||||
| @@ -88,6 +88,8 @@ public:
 | ||||
|        value.convertString(nic_.placement); | ||||
|        } | ||||
|      ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } | ||||
| +  public:
 | ||||
| +    PageFloatFlowObj() {}
 | ||||
|    private: | ||||
|      PageFloatNIC nic_; | ||||
|      StringC name_; | ||||
| @@ -101,6 +103,8 @@ public:
 | ||||
|        fotb.endPageFootnote(); | ||||
|      } | ||||
|      ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } | ||||
| +  public:
 | ||||
| +    PageFootnoteFlowObj() {}
 | ||||
|    private: | ||||
|    }; | ||||
|    ////////////////////////////////////////////////////////////////////// | ||||
| --- a/jade/TransformFOTBuilder.cxx
 | ||||
| +++ b/jade/TransformFOTBuilder.cxx
 | ||||
| @@ -41,6 +41,7 @@ public:
 | ||||
|    }; | ||||
|    class EntityRefFlowObj : public TransformExtensionFlowObj { | ||||
|    public: | ||||
| +    EntityRefFlowObj() {}
 | ||||
|      void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||||
|        fotb.entityRef(name_); | ||||
|      } | ||||
| @@ -56,6 +57,7 @@ public:
 | ||||
|    }; | ||||
|    class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { | ||||
|    public: | ||||
| +    ProcessingInstructionFlowObj() {}
 | ||||
|      void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||||
|        fotb.processingInstruction(data_); | ||||
|      } | ||||
| @@ -98,6 +100,8 @@ public:
 | ||||
|        } | ||||
|      } | ||||
|      ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } | ||||
| +  public:
 | ||||
| +    EmptyElementFlowObj() {}
 | ||||
|    private: | ||||
|      ElementNIC nic_; | ||||
|    }; | ||||
| @@ -133,6 +137,8 @@ public:
 | ||||
|        } | ||||
|      } | ||||
|      ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } | ||||
| +  public:
 | ||||
| +    ElementFlowObj() {}
 | ||||
|    private: | ||||
|      ElementNIC nic_; | ||||
|    }; | ||||
| @@ -150,6 +156,8 @@ public:
 | ||||
|        value.convertString(systemId_); | ||||
|      } | ||||
|      ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } | ||||
| +  public:
 | ||||
| +    EntityFlowObj() {}
 | ||||
|    private: | ||||
|      StringC systemId_; | ||||
|    }; | ||||
| @@ -174,6 +182,8 @@ public:
 | ||||
|        } | ||||
|      } | ||||
|      ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } | ||||
| +  public:
 | ||||
| +    DocumentTypeFlowObj() {}
 | ||||
|    private: | ||||
|      DocumentTypeNIC nic_; | ||||
|    }; | ||||
| @ -1,7 +1,7 @@ | ||||
| Summary: A DSSSL implementation | ||||
| Name: openjade | ||||
| Version: 1.3.2 | ||||
| Release: 37%{?dist} | ||||
| Release: 38%{?dist} | ||||
| Requires: sgml-common | ||||
| URL: http://openjade.sourceforge.net/ | ||||
| Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz | ||||
| @ -13,6 +13,8 @@ Patch1: openjade-1.3.1-nsl.patch | ||||
| Patch2: openjade-deplibs.patch | ||||
| #do not require OpenSP libosp.la file for build(#485114) | ||||
| Patch3: openjade-nola.patch | ||||
| #upstream bug tracker fix for build with gcc46 | ||||
| Patch4: openjade-1.3.2-gcc46.patch | ||||
| License: BSD | ||||
| Group: Applications/Text | ||||
| BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) | ||||
| @ -37,6 +39,7 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. | ||||
| %patch1 -p1 | ||||
| %patch2 -p1 -b .deplibs | ||||
| %patch3 -p1 -b .nola | ||||
| %patch4 -p1 -b .gcc46 | ||||
| 
 | ||||
| 
 | ||||
| %build | ||||
| @ -93,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT | ||||
| %{_datadir}/sgml/%{name}-%{version} | ||||
| 
 | ||||
| %changelog | ||||
| * Wed Jun 08 2011 Ondrej Vasik <ovasik@redhat.com> 1.3.2-38 | ||||
| - fix build with gcc46 (upstream bug tracker) | ||||
| 
 | ||||
| * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-37 | ||||
| - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user