Fix building with gcc-4.7 (bug #415559, thanks to David Kredba). Update gcc-4.3 patch to match upstream.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

4 files changed, 151 insertions, 37 deletions

diff --git a/x11-libs/gtkmathview/ChangeLog b/x11-libs/gtkmathview/ChangeLog
index 5a98069cc387..0f667d88508b 100644
--- a/x11-libs/gtkmathview/ChangeLog
+++ b/x11-libs/gtkmathview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtkmathview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.45 2012/05/24 14:13:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.46 2012/05/26 11:02:45 tetromino Exp $
+
+  26 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtkmathview-0.8.0-r2.ebuild, files/gtkmathview-0.8.0-gcc43.patch,
+  +files/gtkmathview-0.8.0-gcc47.patch:
+  Fix building with gcc-4.7 (bug #415559, thanks to David Kredba). Update
+  gcc-4.3 patch to match upstream.
 
   24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   gtkmathview-0.8.0-r1.ebuild:
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
index 5edfa9236bba..63b49180e4ac 100644
--- a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
@@ -1,56 +1,61 @@
-diff -urN gtkmathview-0.8.0-orig/mathmlps/main.cc gtkmathview-0.8.0/mathmlps/main.cc
---- gtkmathview-0.8.0-orig/mathmlps/main.cc	2008-04-03 22:43:06.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlps/main.cc	2008-04-03 23:53:16.000000000 +0400
-@@ -20,6 +20,7 @@
+diff --git a/mathmlps/main.cc b/mathmlps/main.cc
+index b1a10b7..6d1f58e 100644
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
  
  #include <cassert>
- #include <fstream>
 +#include <cstring>
- 
- #include <popt.h>
- 
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/main.cc gtkmathview-0.8.0/mathmlsvg/main.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/main.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/main.cc	2008-04-03 23:43:31.000000000 +0400
-@@ -20,6 +20,7 @@
- 
- #include <cassert>
  #include <fstream>
-+#include <cstring>
  
  #include <popt.h>
+diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
+index d513e43..1f1f9d1 100644
+--- a/mathmlsvg/SMS.cc
++++ b/mathmlsvg/SMS.cc
+@@ -22,6 +22,7 @@
  
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc gtkmathview-0.8.0/mathmlsvg/SMS.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc	2008-04-03 23:25:12.000000000 +0400
-@@ -19,6 +19,7 @@
  #include <config.h>
  
- #include <sstream>
 +#include <cstring>
+ #include <sstream>
  #include "defs.h"
  #include "AbstractLogger.hh"
- #include "ValueConversion.hh"
-diff -urN gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
---- gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2008-04-03 23:10:05.000000000 +0400
-@@ -20,6 +20,8 @@
+diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
+index ee031a8..fcc9f5c 100644
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
  
  #include <cassert>
- 
 +#include <cstring>
-+
- #include "mathVariantAux.hh"
+ #include <fstream>
  
- static MathVariantAttributes vattr[] = {
-diff -urN gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
---- gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc	2007-08-17 12:02:40.000000000 +0200
-+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc		2008-06-07 12:26:01.000000000 +0200
-@@ -23,6 +23,7 @@
+ #include <popt.h>
+diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc
+index c4299ba..538f18d 100644
+--- a/src/backend/ps/T1_FontDataBase.cc
++++ b/src/backend/ps/T1_FontDataBase.cc
+@@ -23,7 +23,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
  #include <stdlib.h>
  #include <iostream>
  #include <list>
+diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc
+index 7792ca5..92e4716 100644
+--- a/src/engine/mathml/mathVariantAux.cc
++++ b/src/engine/mathml/mathVariantAux.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ 
+ #include <cassert>
 +#include <cstring>
  
- #include "String.hh"
- #include "T1_FontDataBase.hh"
+ #include "mathVariantAux.hh"
+ 
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch
new file mode 100644
index 000000000000..48180ea12fe8
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch
@@ -0,0 +1,101 @@
+From bf7e95285e8df1bc3b86085791de7cf94c2f544f Mon Sep 17 00:00:00 2001
+From: Luca <luca@ant.local>
+Date: Tue, 10 Apr 2012 16:39:57 +0200
+Subject: [PATCH] + patches from Vincent Untz
+
+Conflicts:
+
+	CONTRIBUTORS
+---
+ mathmlps/main.cc                               |    7 +++++++
+ mathmlsvg/SMS.cc                               |    1 +
+ mathmlsvg/main.cc                              |    7 +++++++
+ src/frontend/common/TemplateBuilder.hh         |    7 ++++---
+ src/frontend/common/TemplateElementIterator.hh |    2 +-
+ 5 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/mathmlps/main.cc b/mathmlps/main.cc
+index 48339af..6de113c 100644
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -21,6 +21,13 @@
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
+index be7add8..f4b0ddc 100644
+--- a/mathmlsvg/SMS.cc
++++ b/mathmlsvg/SMS.cc
+@@ -704,6 +704,7 @@ SMS::fun_depart(const HandlerArgs& args) const
+   if (asLocation(args[0], loc1) && asLocation(args[1], loc2))
+   // delete "return 0" and insert here the code
+     return 0;
++  return 0;
+ }
+ 
+ SmartPtr<Value>
+diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
+index c49e8ac..42e7895 100644
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -21,6 +21,13 @@
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff --git a/src/frontend/common/TemplateBuilder.hh b/src/frontend/common/TemplateBuilder.hh
+index f5c8341..2b9a1ac 100644
+--- a/src/frontend/common/TemplateBuilder.hh
++++ b/src/frontend/common/TemplateBuilder.hh
+@@ -47,12 +47,13 @@ protected:
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    SmartPtr<typename ElementBuilder::type> elem;
++    if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-	linkerAdd(el, elem);
++	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++	this->linkerAdd(el, elem);
+ 	return elem;
+       }
+   }
+diff --git a/src/frontend/common/TemplateElementIterator.hh b/src/frontend/common/TemplateElementIterator.hh
+index 5366040..25b5fef 100644
+--- a/src/frontend/common/TemplateElementIterator.hh
++++ b/src/frontend/common/TemplateElementIterator.hh
+@@ -43,7 +43,7 @@ protected:
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
++      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
+-- 
+1.7.8.6
+
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
index 5b2a711aa443..7ac71e8d925b 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild,v 1.1 2012/05/13 12:24:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild,v 1.2 2012/05/26 11:02:45 tetromino Exp $
 
 EAPI="4"
 
@@ -43,6 +43,8 @@ src_prepare() {
 	# Fix building with gold, bug #369117; requires eautoreconf
 	epatch "${FILESDIR}/${P}-underlinking.patch"
 
+	epatch "${FILESDIR}/${P}-gcc47.patch"
+
 	# m4 macros from upstream git, required for eautoreconf
 	if [[ ! -d ac-helpers ]]; then
 		mkdir ac-helpers || die "mkdir failed"