diff options
| author |   Harri Nieminen <moikkis@gmail.com> | 2017-03-03 12:36:01 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-03-07 10:09:56 +0100 |
| commit | 34c000cb3c1e04daf28126095b8aec760e088650 (patch) | |
| tree | 4cfa16f6b9ff9751c0ce4f1e21ca66ab61949dec /x11-libs/gtkmathview/files | |
| parent | media-plugins/kodi-pvr-mythtv: 4.14.1 version bump (diff) | |
| download | gentoo-34c000cb3c1e04daf28126095b8aec760e088650.tar.gz gentoo-34c000cb3c1e04daf28126095b8aec760e088650.tar.bz2 gentoo-34c000cb3c1e04daf28126095b8aec760e088650.zip | |
x11-libs/gtkmathview: Fix build with gcc6, EAPI6
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4119
Diffstat (limited to 'x11-libs/gtkmathview/files')
| -rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch | 4 | ||||
| -rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch | 99 |
2 files changed, 101 insertions, 2 deletions
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch index f85a828e1f23..f15a6ff73fa8 100644 --- a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch @@ -1,5 +1,5 @@ ---- src/common/AbstractLogger.cc.orig 2009-04-25 20:39:35.815053524 +0100 -+++ src/common/AbstractLogger.cc 2009-04-25 20:40:01.240595176 +0100 +--- a/src/common/AbstractLogger.cc.orig 2009-04-25 20:39:35.815053524 +0100 ++++ b/src/common/AbstractLogger.cc 2009-04-25 20:40:01.240595176 +0100 @@ -19,6 +19,7 @@ #include <config.h> diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch new file mode 100644 index 000000000000..7361f8e90c7c --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch @@ -0,0 +1,99 @@ +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 + +--- 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/ComputerModernShaper.cc ++++ b/src/backend/common/ComputerModernShaper.cc +@@ -578,7 +578,7 @@ + }; + #endif + +-static ComputerModernShaper::PlainChar cmsMap[] = ++static ComputerModernShaper::PlainChar32 cmsMap[] = + { + { 0x007B, 0x66 }, // LEFT CURLY BRACKET + { 0x007D, 0x67 }, // RIGHT CURLY BRACKET +--- 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; + }; + |