gtkmathview: Moved from meta-oe

Used by abiword.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Adrian Bunk
2019-08-12 10:35:02 +03:00
parent d6b78d4a43
commit 678476b113
6 changed files with 261 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 19 May 2018 23:18:11 -0700
Subject: [PATCH] Fix formatting for modern c++11 compilers
Fixes
error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/backend/svg/SVG_RenderingContext.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc
index 55d6097..0d50702 100644
--- a/src/backend/svg/SVG_RenderingContext.cc
+++ b/src/backend/svg/SVG_RenderingContext.cc
@@ -68,7 +68,7 @@ void
SVG_RenderingContext::documentStart(const BoundingBox& bbox)
{
beginDocument(bbox);
- metadata("Created by "PACKAGE" version "VERSION);
+ metadata("Created by " PACKAGE " version " VERSION);
}
void
--
2.17.0

View File

@@ -0,0 +1,28 @@
From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 5 May 2015 20:35:01 -0700
Subject: [PATCH] include cstdio to get printf definitions
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/engine/boxml/BoxMLHOVElement.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc
index 1a2812c..96c9eea 100644
--- a/src/engine/boxml/BoxMLHOVElement.cc
+++ b/src/engine/boxml/BoxMLHOVElement.cc
@@ -21,7 +21,7 @@
// <http://www.gnu.org/licenses/>.
#include <config.h>
-
+#include <cstdio>
#include "BoxMLAttributeSignatures.hh"
#include "BoxMLHOVElement.hh"
#include "BoxMLHElement.hh"
--
2.1.4

View File

@@ -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

View File

@@ -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;
};

View File

@@ -0,0 +1,18 @@
Use build_cc to compile the programs to run on build host
helps with cross compiling
Upstream-Status: Inappropriate [Cross-compiled OE specific]
diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am
index 636ccf0..ed9921d 100644
--- a/src/common/mathvariants/Makefile.am
+++ b/src/common/mathvariants/Makefile.am
@@ -52,7 +52,7 @@ XSLTPROC = xsltproc
%.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot
cat $(srcdir)/variant.top >$@
$(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@
- $(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
+ $(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
echo "Char32 " >>$@
basename map_variant_$@ .cc | tr "-" "_" >>$@
echo "(Char32 ch)" >>$@

View File

@@ -0,0 +1,28 @@
HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
DEPENDS = "t1lib gtk+ popt libxslt-native libxml2"
LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
PR = "r3"
SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec"
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 \
file://0001-Fix-formatting-for-modern-c-11-compilers.patch \
"
S = "${WORKDIR}/git"
inherit distro_features_check autotools pkgconfig
REQUIRED_DISTRO_FEATURES = "x11"
do_configure_append() {
# avoid host polution inf pkg-config files
sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'`
}