summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch31
-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/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch63
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch93
-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.bb28
7 files changed, 1 insertions, 262 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index f7eafe2e33..6a9592cfa3 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -142,7 +142,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\
142 can-utils libsocketcan tipcutils tiptop \ 142 can-utils libsocketcan tipcutils tiptop \
143 tmux uml-utilities upm vlock volume-key wipe zlog zram \ 143 tmux uml-utilities upm vlock volume-key wipe zlog zram \
144 ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ 144 ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \
145 ${@bb.utils.contains("DISTRO_FEATURES", "x11", " libgxim t1lib gnuplot libwmf gtkmathview", "", d)} \ 145 ${@bb.utils.contains("DISTRO_FEATURES", "x11", " libgxim t1lib gnuplot libwmf", "", d)} \
146 ${@bb.utils.contains("DISTRO_FEATURES", "bluez", "collectd", "", d)} \ 146 ${@bb.utils.contains("DISTRO_FEATURES", "bluez", "collectd", "", d)} \
147 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb", "", d)} \ 147 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb", "", d)} \
148 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \ 148 ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch b/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch
deleted file mode 100644
index 8b0096630d..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 19 May 2018 23:18:11 -0700
4Subject: [PATCH] Fix formatting for modern c++11 compilers
5
6Fixes
7error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/backend/svg/SVG_RenderingContext.cc | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc
17index 55d6097..0d50702 100644
18--- a/src/backend/svg/SVG_RenderingContext.cc
19+++ b/src/backend/svg/SVG_RenderingContext.cc
20@@ -68,7 +68,7 @@ void
21 SVG_RenderingContext::documentStart(const BoundingBox& bbox)
22 {
23 beginDocument(bbox);
24- metadata("Created by "PACKAGE" version "VERSION);
25+ metadata("Created by " PACKAGE " version " VERSION);
26 }
27
28 void
29--
302.17.0
31
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
deleted file mode 100644
index c5814bfe2b..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
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/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch b/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
deleted file mode 100644
index b879d6a518..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 30 Aug 2016 23:24:53 +0200
4Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to
5 correct implementation
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Pending
11
12Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13---
14 configure.ac | 31 ++++---------------------------
15 1 file changed, 4 insertions(+), 27 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index 4f2118e..16c09d5 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t")
22
23 AC_LANG_PUSH(C++)
24
25-AC_CHECK_HEADERS(unordered_map,
26- [
27- AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided])
28- GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1
29- ],
30- [
31- GMV_HAVE_UNORDERED_MAP_CFLAGS=
32- ]
33-)
34+GMV_HAVE_UNORDERED_MAP_CFLAGS=
35 AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS)
36-AC_CHECK_HEADERS(hash_map,
37- [
38- AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided])
39- GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1
40- ],
41- [
42- GMV_HAVE_HASH_MAP_CFLAGS=
43- ]
44-)
45+GMV_HAVE_HASH_MAP_CFLAGS=
46 AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS)
47-AC_CHECK_HEADERS(ext/hash_map,
48- [
49- AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
50- GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
51- ],
52- [
53- GMV_HAVE_EXT_HASH_MAP_CFLAGS=
54- ]
55-)
56+AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
57+GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
58 AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS)
59
60 AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits])
61--
622.5.5
63
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch b/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch
deleted file mode 100644
index 356274d17e..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
1From: Gert Wollny <gw.fossdev@gmail.com>
2Date: Sun, 26 Jun 2016 13:25:00 +0200
3Description: gcc 6.0 build fixes
4Bug: https://bugs.debian.org/811682
5
6Slightly adapted to our environment
7
8Upstream-Status: Pending
9
10Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
11--- a/src/engine/common/View.cc
12+++ b/src/engine/common/View.cc
13@@ -291,7 +291,7 @@
14 }
15 }
16
17- return false;
18+ return SmartPtr<Element>();
19 }
20
21 bool
22--- a/src/backend/common/tfm/TFM.hh
23+++ b/src/backend/common/tfm/TFM.hh
24@@ -37,7 +37,7 @@
25 unsigned char face;
26 const char* codingScheme;
27 int designSize;
28- int checksum;
29+ unsigned int checksum;
30 unsigned int nDimensions;
31 unsigned int nCharacters;
32 };
33@@ -52,7 +52,7 @@
34 struct Kerning
35 {
36 UChar8 index;
37- int value;
38+ unsigned int value;
39 };
40
41 struct Ligature
42@@ -67,7 +67,7 @@
43 UChar8 index;
44 int width;
45 int height;
46- int depth;
47+ unsigned int depth;
48 int italicCorrection;
49 unsigned char nKernings;
50 const Kerning* kerning;
51--- a/src/backend/common/StandardSymbolsShaper.hh
52+++ b/src/backend/common/StandardSymbolsShaper.hh
53@@ -32,20 +32,20 @@
54 struct HStretchyChar
55 {
56 Char16 ch;
57- Char8 normal;
58- Char8 left;
59- Char8 glue;
60- Char8 right;
61+ UChar8 normal;
62+ UChar8 left;
63+ UChar8 glue;
64+ UChar8 right;
65 };
66
67 struct VStretchyChar
68 {
69 Char16 ch;
70- Char8 normal;
71- Char8 top;
72- Char8 glue;
73- Char8 middle;
74- Char8 bottom;
75+ UChar8 normal;
76+ UChar8 top;
77+ UChar8 glue;
78+ UChar8 middle;
79+ UChar8 bottom;
80 };
81
82 protected:
83--- a/src/backend/common/StandardSymbolsShaper.cc
84+++ b/src/backend/common/StandardSymbolsShaper.cc
85@@ -29,7 +29,7 @@
86 #include "ShapingContext.hh"
87
88 struct GlyphMap {
89- Char8 index;
90+ UChar8 index;
91 Char16 ch;
92 };
93
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch b/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
deleted file mode 100644
index 3fe632860f..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
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
deleted file mode 100644
index 9ee9e30352..0000000000
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
2DEPENDS = "t1lib gtk+ popt libxslt-native libxml2"
3
4LICENSE = "LGPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
6
7PR = "r3"
8SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec"
9PV = "0.8.0+git${SRCPV}"
10
11SRC_URI = "git://github.com/GNOME/gtkmathview.git \
12 file://use_hostcxx.patch \
13 file://0001-include-cstdio-to-get-printf-definitions.patch \
14 file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \
15 file://0003-gcc-6.0-build-fixes.patch \
16 file://0001-Fix-formatting-for-modern-c-11-compilers.patch \
17"
18
19S = "${WORKDIR}/git"
20
21inherit distro_features_check autotools pkgconfig
22
23REQUIRED_DISTRO_FEATURES = "x11"
24
25do_configure_append() {
26 # avoid host polution inf pkg-config files
27 sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'`
28}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-10 11:27:12 +0000