Patchwork [meta-oe,3/4] gtkmathview: fix build error

login
register
mail settings
Submitter Trevor Woerner
Date April 1, 2014, 3:39 a.m.
Message ID <1396323568-18135-4-git-send-email-trevor.woerner@linaro.org>
Download mbox | patch
Permalink /patch/69783/
State Accepted, archived
Headers show

Comments

Trevor Woerner - April 1, 2014, 3:39 a.m.
When building, I was seeing the following error which this patch fixes:

	../../../src/frontend/common/TemplateElementIterator.hh:46:18: error:
	'valid' was not declared in this scope, and no declarations were found by
	argument-dependent lookup at the point of instantiation [-fpermissive]

Upstream-Status: Submitted [padovani .at. di .dot. unito .dot. it]
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 .../mml-widget/gtkmathview/qualify-lookup.diff              | 13 +++++++++++++
 meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb    |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff

Patch

diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff
new file mode 100644
index 0000000..1d48950
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff
@@ -0,0 +1,13 @@ 
+Index: gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+===================================================================
+--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateElementIterator.hh
++++ gtkmathview-0.8.0/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();
+   }
+     
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
index 61f4b9d..bc4b4cb 100644
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
@@ -12,6 +12,7 @@  PR = "r3"
 SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \
            file://mathview-gcc43x.diff \
            file://mathview-gcc47x.diff \
+           file://qualify-lookup.diff \
 "
 SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299"
 SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43"