mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-15 18:16:28 +00:00
gtkmathview: unbreak gcc-6 build and unblacklist
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
Martin Jansa
parent
0368f9927c
commit
e9b5fc160f
@ -0,0 +1,63 @@
|
||||
From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 30 Aug 2016 23:24:53 +0200
|
||||
Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to
|
||||
correct implementation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 31 ++++---------------------------
|
||||
1 file changed, 4 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4f2118e..16c09d5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t")
|
||||
|
||||
AC_LANG_PUSH(C++)
|
||||
|
||||
-AC_CHECK_HEADERS(unordered_map,
|
||||
- [
|
||||
- AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided])
|
||||
- GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1
|
||||
- ],
|
||||
- [
|
||||
- GMV_HAVE_UNORDERED_MAP_CFLAGS=
|
||||
- ]
|
||||
-)
|
||||
+GMV_HAVE_UNORDERED_MAP_CFLAGS=
|
||||
AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS)
|
||||
-AC_CHECK_HEADERS(hash_map,
|
||||
- [
|
||||
- AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided])
|
||||
- GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1
|
||||
- ],
|
||||
- [
|
||||
- GMV_HAVE_HASH_MAP_CFLAGS=
|
||||
- ]
|
||||
-)
|
||||
+GMV_HAVE_HASH_MAP_CFLAGS=
|
||||
AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS)
|
||||
-AC_CHECK_HEADERS(ext/hash_map,
|
||||
- [
|
||||
- AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
|
||||
- GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
|
||||
- ],
|
||||
- [
|
||||
- GMV_HAVE_EXT_HASH_MAP_CFLAGS=
|
||||
- ]
|
||||
-)
|
||||
+AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
|
||||
+GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
|
||||
AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS)
|
||||
|
||||
AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits])
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@ -0,0 +1,93 @@
|
||||
From: Gert Wollny <gw.fossdev@gmail.com>
|
||||
Date: Sun, 26 Jun 2016 13:25:00 +0200
|
||||
Description: gcc 6.0 build fixes
|
||||
Bug: https://bugs.debian.org/811682
|
||||
|
||||
Slightly adapted to our environment
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
--- a/src/engine/common/View.cc
|
||||
+++ b/src/engine/common/View.cc
|
||||
@@ -291,7 +291,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- return false;
|
||||
+ return SmartPtr<Element>();
|
||||
}
|
||||
|
||||
bool
|
||||
--- a/src/backend/common/tfm/TFM.hh
|
||||
+++ b/src/backend/common/tfm/TFM.hh
|
||||
@@ -37,7 +37,7 @@
|
||||
unsigned char face;
|
||||
const char* codingScheme;
|
||||
int designSize;
|
||||
- int checksum;
|
||||
+ unsigned int checksum;
|
||||
unsigned int nDimensions;
|
||||
unsigned int nCharacters;
|
||||
};
|
||||
@@ -52,7 +52,7 @@
|
||||
struct Kerning
|
||||
{
|
||||
UChar8 index;
|
||||
- int value;
|
||||
+ unsigned int value;
|
||||
};
|
||||
|
||||
struct Ligature
|
||||
@@ -67,7 +67,7 @@
|
||||
UChar8 index;
|
||||
int width;
|
||||
int height;
|
||||
- int depth;
|
||||
+ unsigned int depth;
|
||||
int italicCorrection;
|
||||
unsigned char nKernings;
|
||||
const Kerning* kerning;
|
||||
--- a/src/backend/common/StandardSymbolsShaper.hh
|
||||
+++ b/src/backend/common/StandardSymbolsShaper.hh
|
||||
@@ -32,20 +32,20 @@
|
||||
struct HStretchyChar
|
||||
{
|
||||
Char16 ch;
|
||||
- Char8 normal;
|
||||
- Char8 left;
|
||||
- Char8 glue;
|
||||
- Char8 right;
|
||||
+ UChar8 normal;
|
||||
+ UChar8 left;
|
||||
+ UChar8 glue;
|
||||
+ UChar8 right;
|
||||
};
|
||||
|
||||
struct VStretchyChar
|
||||
{
|
||||
Char16 ch;
|
||||
- Char8 normal;
|
||||
- Char8 top;
|
||||
- Char8 glue;
|
||||
- Char8 middle;
|
||||
- Char8 bottom;
|
||||
+ UChar8 normal;
|
||||
+ UChar8 top;
|
||||
+ UChar8 glue;
|
||||
+ UChar8 middle;
|
||||
+ UChar8 bottom;
|
||||
};
|
||||
|
||||
protected:
|
||||
--- a/src/backend/common/StandardSymbolsShaper.cc
|
||||
+++ b/src/backend/common/StandardSymbolsShaper.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "ShapingContext.hh"
|
||||
|
||||
struct GlyphMap {
|
||||
- Char8 index;
|
||||
+ UChar8 index;
|
||||
Char16 ch;
|
||||
};
|
||||
|
||||
@ -11,6 +11,8 @@ PV = "0.8.0+git${SRCPV}"
|
||||
SRC_URI = "git://github.com/GNOME/gtkmathview.git \
|
||||
file://use_hostcxx.patch \
|
||||
file://0001-include-cstdio-to-get-printf-definitions.patch \
|
||||
file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \
|
||||
file://0003-gcc-6.0-build-fixes.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
@ -21,6 +23,3 @@ do_configure_append() {
|
||||
# avoid host polution inf pkg-config files
|
||||
sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'`
|
||||
}
|
||||
|
||||
# http://errors.yoctoproject.org/Errors/Details/68615/
|
||||
PNBLACKLIST[gtkmathview] ?= "BROKEN: fails to build with gcc-6"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user