rpms/gtkmathview/devel gtkmathview-0.7.6-gcc43.patch, NONE, 1.1 gtkmathview.spec, 1.9, 1.10

[Doug Chapman (dchapman)]

Author: dchapman

Update of /cvs/pkgs/rpms/gtkmathview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24928

Modified Files:
	gtkmathview.spec 
Added Files:
	gtkmathview-0.7.6-gcc43.patch 
Log Message:
fix GCC 4.3 build errors (BZ 434485)
require popt-devel for build (BZ 426136)




gtkmathview-0.7.6-gcc43.patch:

--- NEW FILE gtkmathview-0.7.6-gcc43.patch ---
diff -up gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc.broken gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc
--- gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc.broken	2008-03-14 14:09:58.000000000 -0400
+++ gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc	2008-03-14 14:10:16.000000000 -0400
@@ -21,6 +21,7 @@
 // <luca.padovani at cs.unibo.it>
 
 #include <config.h>
+#include <algorithm>
 #include <assert.h>
 
 #include "traverseAux.hh"
diff -up gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc.broken gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc
--- gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc.broken	2008-03-14 14:08:07.000000000 -0400
+++ gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc	2008-03-14 14:09:37.000000000 -0400
@@ -21,7 +21,7 @@
 // <luca.padovani at cs.unibo.it>
 
 #include <config.h>
-
+#include <cstring>
 #include <cassert>
 
 #include "mathVariantAux.hh"
diff -up gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc.broken gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc
--- gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc.broken	2008-03-14 14:05:11.000000000 -0400
+++ gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc	2008-03-14 14:05:35.000000000 -0400
@@ -21,7 +21,7 @@
 // <lpadovan at cs.unibo.it>
 
 #include <config.h>
-
+#include <algorithm>
 #include <cassert>
 
 #include "Adapters.hh"
diff -up gtkmathview-0.7.6/mathmlsvg/main.cc.broken gtkmathview-0.7.6/mathmlsvg/main.cc
--- gtkmathview-0.7.6/mathmlsvg/main.cc.broken	2008-03-14 14:13:10.000000000 -0400
+++ gtkmathview-0.7.6/mathmlsvg/main.cc	2008-03-14 14:13:46.000000000 -0400
@@ -21,7 +21,7 @@
 // <lpadovan at cs.unibo.it>
 
 #include <config.h>
-
+#include <cstring>
 #include <cassert>
 #include <fstream>
 


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtkmathview.spec	20 Feb 2008 06:04:10 -0000	1.9
+++ gtkmathview.spec	14 Mar 2008 20:15:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
 Version: 0.7.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -11,8 +11,11 @@
 BuildRequires: libxml2-devel >= 2.6.7
 BuildRequires: libxslt >= 1.0.32
 BuildRequires: popt >= 1.7 
+BuildRequires: popt-devel >= 1.7 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: gtkmathview-0.7.6-gcc43.patch
+
 %description
 GtkMathView is a C++ rendering engine for MathML documents. 
 It provides an interactive view that can be used for browsing 
@@ -33,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-static
@@ -75,6 +79,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Mar 14 2008 Doug chapman <doug.chapman at hp.com> - 0.7.6-7
+- fix GCC 4.3 build errors (BZ 434485)
+- require popt-devel for build (BZ 426136)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.6-6
 - Autorebuild for GCC 4.3