[arch-commits] Commit in gtkmathview/trunk (3 files)

[Antonio Rojas]

    Date: Tuesday, June 5, 2018 @ 21:03:54
  Author: arojas
Revision: 325956

BUILDINFO rebuild

Added:
  gtkmathview/trunk/gtkmathview-gcc6.patch
  gtkmathview/trunk/gtkmathview-gcc7.patch
Modified:
  gtkmathview/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   14 ++++--
 gtkmathview-gcc6.patch |   99 +++++++++++++++++++++++++++++++++++++++++++++++
 gtkmathview-gcc7.patch |   27 ++++++++++++
 3 files changed, 136 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-05 20:51:39 UTC (rev 325955)
+++ PKGBUILD	2018-06-05 21:03:54 UTC (rev 325956)
@@ -4,7 +4,7 @@
 
 pkgname=gtkmathview
 pkgver=0.8.0
-pkgrel=5
+pkgrel=6
 pkgdesc="C++ rendering engine for MathML documents"
 arch=('x86_64')
 url="http://helm.cs.unibo.it/mml-widget/"
@@ -14,12 +14,16 @@
         gtkmathview-0.8.0-gcc43.patch
         gtkmathview-0.8.0-cond-t1.patch
         gtkmathview-0.8.0-gcc47.patch
-        gtkmathview-0.8.0-includes.patch)
+        gtkmathview-0.8.0-includes.patch
+        gtkmathview-gcc6.patch
+        gtkmathview-gcc7.patch)
 md5sums=('b53564e553728d4b69f7d366dfeb5299'
          '92eb2870c1922cbebd5566900cde220b'
          'a79a27e00908e75712bc9453b669fe61'
          '8c8620aee002b30975e1e175ef9af7a7'
-         '4fc8daefbf27d49067b0c66bba54f428')
+         '4fc8daefbf27d49067b0c66bba54f428'
+         '280e26beb1b6f1008d75b90c485dd47f'
+         '8ecffe417121723755749444dfcbbafb')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -27,7 +31,9 @@
   patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc47.patch
   patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-includes.patch
   patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch
-  
+  patch -p1 -i ../gtkmathview-gcc6.patch # Debian patch  
+  patch -p1 -i ../gtkmathview-gcc7.patch # Debian patch
+
   # AM_BINRELOC missing, just ignore
   echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
   autoreconf -if

Added: gtkmathview-gcc6.patch
===================================================================
--- gtkmathview-gcc6.patch	                        (rev 0)
+++ gtkmathview-gcc6.patch	2018-06-05 21:03:54 UTC (rev 325956)
@@ -0,0 +1,99 @@
+From: Gert Wollny <gw.fossdev at 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 nullptr;
+ }
+ 
+ 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;
+ };
+ 

Added: gtkmathview-gcc7.patch
===================================================================
--- gtkmathview-gcc7.patch	                        (rev 0)
+++ gtkmathview-gcc7.patch	2018-06-05 21:03:54 UTC (rev 325956)
@@ -0,0 +1,27 @@
+Description: Fix "call of overloaded 'abs(guint32)' is ambiguous"
+Author: Dmitry Marakasov <amdmi3 at FreeBSD.org>
+Origin: https://svnweb.freebsd.org/ports/head/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc?view=markup
+Bug-Debian: https://bugs.debian.org/853436
+Last-Update: 2017-12-19
+
+--- a/src/widget/gtkmathview_common.cc
++++ b/src/widget/gtkmathview_common.cc
+@@ -909,7 +909,7 @@
+ 	  math_view->select_state == SELECT_STATE_NO &&
+ 	  fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
+ 	  fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
+-	  abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE)
++	  abs((long)math_view->button_press_time - (long)event->time) <= CLICK_TIME_RANGE)
+ 	{
+ 	  // the mouse should have not moved more than one pixel in each direction
+ 	  // and the time elapsed from the press event should be no more than 250ms
+@@ -969,7 +969,7 @@
+       (math_view->select_state == SELECT_STATE_YES ||
+        fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
+        fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||
+-       abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE))
++       abs((long)math_view->button_press_time - (long)event->time) > CLICK_TIME_RANGE))
+     {
+       if (math_view->select_state == SELECT_STATE_NO)
+ 	{
+