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

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 162 insertions, 47 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/Manifest b/x11-libs/gtkmathview/Manifest
index 64d589ed0bc6..f880584979bb 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -4,23 +4,24 @@ Hash: SHA1
 AUX binreloc.m4 2563 RMD160 0a0706877bf00fe5a811443b9962ea7b3dc1ce7b SHA1 fb0f1adb23507c1aff03f80b58d35f534e2fc772 SHA256 cc9c0d1dd10f7664aaa37c7d77e426fa976eb8cd96a739760545c75db7c1096b
 AUX gtkmathview-0.8.0-cond-t1.patch 1270 RMD160 3a3cbeaa1882162116cb3e5b0ccb57f23341c6a8 SHA1 ef2e8ade3890fa682c47318483482fc3971261e5 SHA256 731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709
 AUX gtkmathview-0.8.0-fix-template.patch 2209 RMD160 25dd051d49106f0bd2406a75fc6a5a657fd44980 SHA1 2d08f502427fec1b4e82b687018f61e04c52f680 SHA256 b5c43c185ec0920882eb8f27e46082baf32c0e9583c62bfc28d1c6a2ca4e0a7b
-AUX gtkmathview-0.8.0-gcc43.patch 2006 RMD160 bef4b3a2d9f93aa302b445c7a3157e3c1c786860 SHA1 6818e6d50d6bb739e0bcb9c89c879aebb730bee5 SHA256 3915f9f0d58e4eb5294b817bb5323cd9954676ff1044db3683fbaee94200688b
+AUX gtkmathview-0.8.0-gcc43.patch 1437 RMD160 d70c3ef268aa767bd0ed94e8977858732a7212d7 SHA1 2b375d68c01bbaf02e31ad80650f17679c91b171 SHA256 49bac4edcbad1b06614e889f28fc89f4b6d4a013e0e14f0a6bffc9e92a68e047
 AUX gtkmathview-0.8.0-gcc44.patch 259 RMD160 280e790b97442bee1c0f31d24961ebb5cea91762 SHA1 ea57cf665803d3bc901677d0a4df581a5676d433 SHA256 5972d8a65f1dc4253f83d082d3afc5d9dc36aa1d365bd66a0114834200d5adf5
+AUX gtkmathview-0.8.0-gcc47.patch 3123 RMD160 400ec03ebb4ab0a32e9152f66de0b7a29854f841 SHA1 9069f5122781fe0092de58aa7832413ba9ba5491 SHA256 520ca656ce5ebd32efe7183cbb09b270c2cb80099632628afc397070089d5d92
 AUX gtkmathview-0.8.0-underlinking.patch 1926 RMD160 41a5a069d3ee3223749be021a6e72b2807d13a80 SHA1 029d883c3767cefe31e84654a0ff18e0d12613c8 SHA256 d0a466e074f0344529410f988a2097b0103cf86eca760c8f1a6da6a0a2cbd682
 DIST gtkmathview-0.8.0.tar.gz 987328 RMD160 6ed60ee9253fd0fdd9bc595a9178ede5100e1644 SHA1 dc6db75a64b8dcde05185c3c54eec310dd7b14d6 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
 EBUILD gtkmathview-0.8.0-r1.ebuild 2012 RMD160 daf6c34348caf58096e76fef09d912674985e16c SHA1 9fd9669d2fbdb327e14abb4e456cbf8db74972c3 SHA256 e1d18fc8294f6b33335d135fb54fbfb1821690e987c9d701bf9e14e9f656426a
-EBUILD gtkmathview-0.8.0-r2.ebuild 1981 RMD160 f6bee32038968c494a3725c44cc90af77e98038a SHA1 4298f5d1fea219279fd8b98ce052a196eb21d4ad SHA256 2b54d85ae83edb744b908a5d446f0b5169fc5b7bc897f4c5ed8f505a6843c06b
+EBUILD gtkmathview-0.8.0-r2.ebuild 2025 RMD160 47b5583adb79bbc1e5116e49141fad574c0cbe1e SHA1 a76247bc5fd2fff54430ef85160758709e0b517e SHA256 7f9448fc96dd8f00ce972beff4ba665cd223180b2e189be03f18adf8b5684401
 EBUILD gtkmathview-0.8.0.ebuild 1624 RMD160 7c352d7dc81d661eda074c872f91eb54153b5859 SHA1 1bcba5970f0a03cbe15e60603b586d8472d4072b SHA256 f3e6acf825c866518f7b4f287f2d441c3474722f994a616fef360154ecf9818f
-MISC ChangeLog 6636 RMD160 ab414908c00c4fbb8b7a053bc6657153304e656d SHA1 37974c9b1e337250c9753c332ed3526d62bb2a29 SHA256 57c8dc70fda9471e53efa647b02f36c65957d812f281ecbea5a1a66aa40c8904
+MISC ChangeLog 6913 RMD160 300590e940483578bdb75f20a7dce1b78a7aa334 SHA1 40e005bca92e793836c1a37c4389c44d932a75ff SHA256 1fe01edac0e744740d6d62d9e4b65077c57410ca7d1a7c6f843b8183b888a8b6
 MISC metadata.xml 322 RMD160 93188106c96393134a42147325102285f84c2a34 SHA1 f2230e9e3e79fc0c31eb1e4eccf8cc79c095bb8a SHA256 704cac33a6aa221b157f52cbb9fd95cd46b8ba27e0b29a00f91f50c07e5200f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvkICAAoJEEdUh39IaPFNtcoH/3wPjQM3pLb0cQ8Zt0vTgvt5
-IUMoI5ra2I0xl9kw2ydzPchks4DcxCvOZPWE41ucVFuUbJwJRYRNBjQSzB91Rdrc
-ocaUOYtB73c4BiqCc8i7zl9LgPzPV41C/YQBqzJAcZJiMvvM8vGrJrfBrMyvr6H0
-ZBr52qO2bzJC0c3Rgky24qhGxHa9w6icJWQExvO1RVCcN4zKalPCHTSSIjnskpx+
-YbNQRbzPHWZhye7guFdq/uERKtS3Pudt6S/j7lloeCmgvD62qL4XVgn06x+njgit
-xOfoHFOki/L/YlLjCoJCSXG4JOfay23aTAXZ0uNgTZuSrc/5gFdj7Varaev8yLs=
-=iIUa
+iQEcBAEBAgAGBQJPwLhaAAoJEJ0WA1zPCt1hE4AIAI3VRtrY8YFotv7M2R3D6er6
+sJbERozabTfqk5NltMi13CZKSRXDIRCBjcEigsal5/0pgoqd0oFLOY9XuN+yV7Nk
+eCt6GikCHPtdrUk2ojHxGMSMgk00KWKNnVByfoENjIyt9tnAenD7UGmVvx6uYeEO
+nXZPlalg9iQ9YHduRIMBlsRjVzlycujx09uTIdjKqSN3NU/p+KxLkp1n/D9+sWbr
+Q2iiBg/1HNxm2sKmW36/bS3ycXho2n7UroCVIZK8+jh5P+RDC2ZGZ2PlxEVxxYRx
+RZa8+glJQxUL2fcJzZHDYNqgQxLYFLGY0LTSa+EdqtkDuMgZibZ6MQVSoj31Ees=
+=J5SJ
 -----END PGP SIGNATURE-----
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"