diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch')
| -rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch | 101 |
1 files changed, 101 insertions, 0 deletions
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 + |
