summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch28
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff63
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff48
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff13
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch18
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb17
6 files changed, 55 insertions, 132 deletions
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch b/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
new file mode 100644
index 0000000000..c5814bfe2b
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
@@ -0,0 +1,28 @@
1From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 May 2015 20:35:01 -0700
4Subject: [PATCH] include cstdio to get printf definitions
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 src/engine/boxml/BoxMLHOVElement.cc | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc
14index 1a2812c..96c9eea 100644
15--- a/src/engine/boxml/BoxMLHOVElement.cc
16+++ b/src/engine/boxml/BoxMLHOVElement.cc
17@@ -21,7 +21,7 @@
18 // <http://www.gnu.org/licenses/>.
19
20 #include <config.h>
21-
22+#include <cstdio>
23 #include "BoxMLAttributeSignatures.hh"
24 #include "BoxMLHOVElement.hh"
25 #include "BoxMLHElement.hh"
26--
272.1.4
28
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff
deleted file mode 100644
index fcc52c1f4a..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff
+++ /dev/null
@@ -1,63 +0,0 @@
1--- /tmp/mathVariantAux.cc 2008-07-13 15:56:56.000000000 +0200
2+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-13 15:57:46.893198000 +0200
3@@ -20,6 +20,8 @@
4
5 #include <cassert>
6
7+#include <string.h>
8+
9 #include "mathVariantAux.hh"
10
11 static MathVariantAttributes vattr[] = {
12--- /tmp/T1_FontDataBase.cc 2008-07-13 16:25:24.000000000 +0200
13+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-13 16:25:47.123198000 +0200
14@@ -20,6 +20,7 @@
15 #include <config.h>
16 #include <map>
17 #include <string>
18+#include <string.h>
19 #include <stdlib.h>
20 #include <iostream>
21 #include <list>
22--- /tmp/SMS.cc 2008-07-13 16:27:23.000000000 +0200
23+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-13 16:27:41.543198000 +0200
24@@ -19,6 +19,7 @@
25 #include <config.h>
26
27 #include <sstream>
28+#include <string.h>
29 #include "defs.h"
30 #include "AbstractLogger.hh"
31 #include "ValueConversion.hh"
32--- /tmp/main.cc 2008-07-13 16:29:11.000000000 +0200
33+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-13 16:29:28.813198000 +0200
34@@ -20,7 +20,7 @@
35
36 #include <cassert>
37 #include <fstream>
38-
39+#include <string.h>
40 #include <popt.h>
41
42 // needed for old versions of GCC, must come before String.hh!
43--- /tmp/main.cc 2008-07-13 16:30:11.000000000 +0200
44+++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-13 16:30:33.183198000 +0200
45@@ -20,7 +20,7 @@
46
47 #include <cassert>
48 #include <fstream>
49-
50+#include <string.h>
51 #include <popt.h>
52
53 // needed for old versions of GCC, must come before String.hh!
54--- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc 2007-08-17 12:02:45.000000000 +0200
55+++ gtkmathview-0.8.0/src/common/AbstractLogger.cc 2010-02-01 10:19:46.000000000 +0100
56@@ -19,6 +19,7 @@
57 #include <config.h>
58
59 #include <stdarg.h>
60+#include <stdio.h>
61
62 #include "AbstractLogger.hh"
63
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff
deleted file mode 100644
index 11b7260045..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff
+++ /dev/null
@@ -1,48 +0,0 @@
1../../../src/frontend/common/TemplateBuilder.hh:50:113: warning: 'linkerAssoc' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
2../../../src/frontend/common/TemplateBuilder.hh:50:113: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup
3../../../src/frontend/common/TemplateBuilder.hh:50:113: note: use 'this->linkerAssoc' instead
4../../../src/frontend/common/TemplateBuilder.hh:54:111: error: redeclaration of 'SmartPtr<BoxMLDecorElement> elem'
5../../../src/frontend/common/TemplateBuilder.hh:50:49: error: 'SmartPtr<BoxMLDecorElement> elem' previously declared here
6../../../src/frontend/common/TemplateBuilder.hh:55:2: warning: 'linkerAdd' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
7../../../src/frontend/common/TemplateBuilder.hh:55:2: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup
8../../../src/frontend/common/TemplateBuilder.hh:55:2: note: use 'this->linkerAdd' instead
9
10--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh 2007-08-17 12:02:34.000000000 +0200
11+++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-04-30 11:45:07.000000000 +0200
12@@ -47,12 +47,13 @@
13 SmartPtr<typename ElementBuilder::type>
14 getElement(const typename Model::Element& el) const
15 {
16- if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
17+ SmartPtr<typename ElementBuilder::type> elem = NULL;
18+ if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
19 return elem;
20 else
21 {
22- SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
23- linkerAdd(el, elem);
24+ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
25+ this->linkerAdd(el, elem);
26 return elem;
27 }
28 }
29--- gtkmathview-0.8.0.orig/mathmlsvg/main.cc 2012-04-30 11:35:19.000000000 +0200
30+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-04-30 11:51:19.000000000 +0200
31@@ -20,6 +20,7 @@
32
33 #include <cassert>
34 #include <fstream>
35+#include <unistd.h>
36 #include <string.h>
37 #include <popt.h>
38
39--- gtkmathview-0.8.0.orig/mathmlps/main.cc 2012-04-30 11:35:19.000000000 +0200
40+++ gtkmathview-0.8.0/mathmlps/main.cc 2012-04-30 11:50:57.000000000 +0200
41@@ -20,6 +20,7 @@
42
43 #include <cassert>
44 #include <fstream>
45+#include <unistd.h>
46 #include <string.h>
47 #include <popt.h>
48
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff
deleted file mode 100644
index 1d48950451..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
2===================================================================
3--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateElementIterator.hh
4+++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
5@@ -43,7 +43,7 @@ protected:
6 findValidNodeForward(const typename Model::Node& p0) const
7 {
8 for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
9- if (valid(p)) return Model::asElement(p);
10+ if (this->valid(p)) return Model::asElement(p);
11 return typename Model::Element();
12 }
13
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch b/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
new file mode 100644
index 0000000000..3fe632860f
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
@@ -0,0 +1,18 @@
1Use build_cc to compile the programs to run on build host
2helps with cross compiling
3
4Upstream-Status: Inappropriate [Cross-compiled OE specific]
5
6diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am
7index 636ccf0..ed9921d 100644
8--- a/src/common/mathvariants/Makefile.am
9+++ b/src/common/mathvariants/Makefile.am
10@@ -52,7 +52,7 @@ XSLTPROC = xsltproc
11 %.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot
12 cat $(srcdir)/variant.top >$@
13 $(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@
14- $(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
15+ $(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
16 echo "Char32 " >>$@
17 basename map_variant_$@ .cc | tr "-" "_" >>$@
18 echo "(Char32 ch)" >>$@
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 65b07f5022..2dbec7d167 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
@@ -5,16 +5,17 @@ LICENSE = "LGPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" 5LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
6 6
7PR = "r3" 7PR = "r3"
8SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec"
9PV = "0.8.0+git${SRCPV}"
8 10
9SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${BP}.tar.gz \ 11SRC_URI = "git://github.com/GNOME/gtkmathview.git \
10 file://mathview-gcc43x.diff \ 12 file://use_hostcxx.patch \
11 file://mathview-gcc47x.diff \ 13 file://0001-include-cstdio-to-get-printf-definitions.patch \
12 file://qualify-lookup.diff \ 14 "
13"
14SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299"
15SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43"
16 15
17inherit autotools-brokensep pkgconfig 16S = "${WORKDIR}/git"
17
18inherit autotools pkgconfig
18 19
19do_configure_prepend() { 20do_configure_prepend() {
20 sed -i -e s:AM_BINRELOC::g ${S}/configure.ac 21 sed -i -e s:AM_BINRELOC::g ${S}/configure.ac
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-12 08:57:30 +0000