Skip to content

Commit 062e1d5

Browse files
committed
graphviz: update to 2.49.3
Running some programs like gvpack fails on device with CANNOT LINK EXECUTABLE "gvpack": cannot locate symbol "__extendsftf2" referenced by "/data/data/com.termux/files/usr/lib/graphviz/libgvplugin_neato_layout.so"... which is the same error as we saw for tesseract [1] with configure&make. There seem to be an issue somewhere that might be affecting many configure&make packages. [1] #7953
1 parent a9de8a2 commit 062e1d5

6 files changed

+18
-64
lines changed

packages/graphviz/build.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.graphviz.org/
22
TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
33
TERMUX_PKG_LICENSE="EPL-2.0"
44
TERMUX_PKG_MAINTAINER="@termux"
5-
TERMUX_PKG_VERSION=2.44.1
6-
TERMUX_PKG_REVISION=4
7-
TERMUX_PKG_SRCURL=https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$TERMUX_PKG_VERSION.tar.gz
8-
TERMUX_PKG_SHA256=8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313
5+
TERMUX_PKG_VERSION=2.49.3
6+
TERMUX_PKG_SRCURL=https://gitlab.com/graphviz/graphviz/-/archive/${TERMUX_PKG_VERSION}/graphviz-${TERMUX_PKG_VERSION}.tar.gz
7+
TERMUX_PKG_SHA256=5801664769ab88c2fb8ccb6ab0957cceabe6d4632b193041440e97790f53a9df
98
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib"
109
TERMUX_PKG_BREAKS="graphviz-dev"
1110
TERMUX_PKG_REPLACES="graphviz-dev"
@@ -32,6 +31,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
3231
"
3332
TERMUX_PKG_RM_AFTER_INSTALL="bin/*-config share/man/man1/*-config.1"
3433

34+
# In file included from /home/builder/.termux-build/graphviz/src/lib/expr/expr.h:28:
35+
# /home/builder/.termux-build/graphviz/src/lib/expr/exparse.h:4:10: fatal error: 'expr/y.tab.h' file not found
36+
TERMUX_PKG_BUILD_IN_SRC=true
37+
3538
termux_step_pre_configure() {
3639
./autogen.sh NOCONFIG
3740
export HOSTCC="gcc"

packages/graphviz/cmd-edgepaint-Makefile.am.patch

-11
This file was deleted.

packages/graphviz/configure.ac.patch

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
We don't have ps2pdf (ghostscript) in the docker image, and defaulting to false gives an error
2-
--- ../configure.ac.orig 2020-07-21 20:56:45.916983567 +0000
3-
+++ ./configure.ac 2020-07-21 20:58:06.050817612 +0000
4-
@@ -282,10 +282,10 @@
1+
--- ./configure.ac.orig 2021-11-21 17:16:59.713007065 +0000
2+
+++ ./configure.ac 2021-11-21 17:17:39.776340523 +0000
3+
@@ -279,9 +279,9 @@
54
AC_CHECK_PROGS(SED,gsed sed,false)
65
AC_CHECK_PROGS(SORT,gsort sort,false)
76

87
-AC_CHECK_PROG(EGREP,egrep,egrep,false)
98
-AC_CHECK_PROG(GROFF,groff,groff,false)
10-
-AC_CHECK_PROG(PS2PDF,ps2pdf,ps2pdf,false)
11-
-AC_CHECK_PROG(PS2PDF,pstopdf,pstopdf,false)
9+
-AC_CHECK_PROGS(PS2PDF,ps2pdf pstopdf,false)
1210
+AC_CHECK_PROG(EGREP,egrep,egrep,echo)
1311
+AC_CHECK_PROG(GROFF,groff,groff,echo)
14-
+AC_CHECK_PROG(PS2PDF,ps2pdf,ps2pdf,echo)
15-
+AC_CHECK_PROG(PS2PDF,pstopdf,pstopdf,echo)
16-
17-
PKG_PROG_PKG_CONFIG
12+
+AC_CHECK_PROGS(PS2PDF,ps2pdf pstopdf,echo)
13+
AM_CONDITIONAL(HAVE_PS2PDF,[test "x$PS2PDF" != xfalse])
1814

15+
AC_ARG_ENABLE([man-pdfs],

packages/graphviz/lib-gvc-gvconfig.c.patch

-23
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
--- ../cmd-dot-Makefile.am.orig 2020-03-28 15:09:39.244338000 +0100
2-
+++ ./cmd/dot/Makefile.am 2020-03-28 15:10:03.697623920 +0100
3-
@@ -58,7 +58,6 @@
1+
--- ./cmd/dot/Makefile.am.orig 2021-11-21 17:19:25.932998918 +0000
2+
+++ ./cmd/dot/Makefile.am 2021-11-21 17:20:07.196326051 +0000
3+
@@ -76,7 +76,6 @@
44
# run "dot -c", if possible, to create plugin config
55
install-exec-hook:
66
(cd $(DESTDIR)$(bindir); if test -x dot$(EXEEXT); then for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot$(EXEEXT) $$i; done; fi;)
7-
- if test "x$(DESTDIR)" = "x"; then if test -x $(bindir)/dot$(EXEEXT); then if test -x /sbin/ldconfig; then /sbin/ldconfig 2>/dev/null; fi; $(bindir)/dot$(EXEEXT) -c; else $(bindir)/dot_static$(EXEEXT) -c; fi; fi
7+
- if test "x$(DESTDIR)" = "x"; then if test -x $(bindir)/dot$(EXEEXT); then if test -x /sbin/ldconfig; then /sbin/ldconfig 2>/dev/null; fi; cd $(bindir); ./dot$(EXEEXT) -c; else cd $(bindir); ./dot_static$(EXEEXT) -c; fi; fi
88

99
uninstall-hook:
1010
(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;)

packages/graphviz/plugin-webp-Makefile.am.patch

-12
This file was deleted.

0 commit comments

Comments
 (0)