From 6dac3a7bb459c2e0a6f783c03d3a020bcf75fba9 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 19 Jan 2017 21:18:28 +0100
Subject: [PATCH] graphviz: Update from 2.38.0 to 2.40.1

---
 packages/graphviz/build.sh        |  8 ++++----
 packages/graphviz/no-mkdefs.patch | 28 +++++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh
index 90efdba9c..8d84c6796 100644
--- a/packages/graphviz/build.sh
+++ b/packages/graphviz/build.sh
@@ -1,10 +1,9 @@
-TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo"
 TERMUX_PKG_HOMEPAGE=http://www.graphviz.org/
 TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
-TERMUX_PKG_VERSION=2.38.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo"
+TERMUX_PKG_VERSION=2.40.1
 TERMUX_PKG_SRCURL=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e
+TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
 TERMUX_PKG_DEPENDS="libandroid-glob,libcairo,pango,libexpat,libltdl,librsvg,libgd"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-poppler=no --enable-java=no --enable-perl=no
@@ -16,6 +15,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/*-config share/man/man1/*-config.1"
 
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
+	CPPFLAGS+=" -D_typ_ssize_t=1"
 }
 
 termux_step_post_make_install() {
diff --git a/packages/graphviz/no-mkdefs.patch b/packages/graphviz/no-mkdefs.patch
index bace84824..bf9f9c0e2 100644
--- a/packages/graphviz/no-mkdefs.patch
+++ b/packages/graphviz/no-mkdefs.patch
@@ -1,23 +1,25 @@
-diff -r -u graphviz-2.38.0/lib/gvpr/Makefile.am src/lib/gvpr/Makefile.am
---- graphviz-2.38.0/lib/gvpr/Makefile.am	2014-04-13 13:40:25.000000000 -0700
-+++ src/lib/gvpr/Makefile.am	2016-04-02 20:34:42.351125236 -0700
-@@ -53,7 +53,7 @@
+http://www.graphviz.org/content/cant-cross-compile-graphviz
+
+diff -u -r ../graphviz-2.40.1/lib/gvpr/Makefile.am ./lib/gvpr/Makefile.am
+--- ../graphviz-2.40.1/lib/gvpr/Makefile.am	2016-08-09 23:02:10.000000000 +0200
++++ ./lib/gvpr/Makefile.am	2017-01-19 20:01:22.745725697 +0100
+@@ -57,7 +57,7 @@
  mkdefs_SOURCES = mkdefs.c
  
- gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs
--	./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
+ gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT)
+-	./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
 +	touch gdefs.h
  
- EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcproj
+ EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj*
  
-diff -r -u graphviz-2.38.0/lib/gvpr/Makefile.in src/lib/gvpr/Makefile.in
---- graphviz-2.38.0/lib/gvpr/Makefile.in	2014-04-13 13:41:55.000000000 -0700
-+++ src/lib/gvpr/Makefile.in	2016-04-02 20:35:14.926790938 -0700
-@@ -1065,7 +1065,7 @@
+diff -u -r ../graphviz-2.40.1/lib/gvpr/Makefile.in ./lib/gvpr/Makefile.in
+--- ../graphviz-2.40.1/lib/gvpr/Makefile.in	2016-12-25 04:04:59.000000000 +0100
++++ ./lib/gvpr/Makefile.in	2017-01-19 20:02:07.293214993 +0100
+@@ -1084,7 +1084,7 @@
  	- @GROFF@ -Tps -man $(srcdir)/gvpr.3 | @PS2PDF@ - - >gvpr.3.pdf
  
- gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs
--	./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
+ gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT)
+-	./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
 +	touch gdefs.h
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.