graphviz: bump to 2.49.3
This commit is contained in:
parent
150008c502
commit
f018bf2cb7
|
@ -2,14 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://www.graphviz.org/
|
||||||
TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
|
TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
|
||||||
TERMUX_PKG_LICENSE="EPL-2.0"
|
TERMUX_PKG_LICENSE="EPL-2.0"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=2.44.1
|
TERMUX_PKG_VERSION=2.49.3
|
||||||
TERMUX_PKG_REVISION=4
|
TERMUX_PKG_SRCURL=https://gitlab.com/graphviz/graphviz/-/archive/$TERMUX_PKG_VERSION/graphviz-$TERMUX_PKG_VERSION.tar.gz
|
||||||
TERMUX_PKG_SRCURL=https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$TERMUX_PKG_VERSION.tar.gz
|
TERMUX_PKG_SHA256=5801664769ab88c2fb8ccb6ab0957cceabe6d4632b193041440e97790f53a9df
|
||||||
TERMUX_PKG_SHA256=8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313
|
|
||||||
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib"
|
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib"
|
||||||
TERMUX_PKG_BREAKS="graphviz-dev"
|
TERMUX_PKG_BREAKS="graphviz-dev"
|
||||||
TERMUX_PKG_REPLACES="graphviz-dev"
|
TERMUX_PKG_REPLACES="graphviz-dev"
|
||||||
TERMUX_PKG_BUILD_DEPENDS="libtool"
|
TERMUX_PKG_BUILD_DEPENDS="libtool"
|
||||||
|
TERMUX_PKG_BUILD_IN_SRC=true
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
--enable-guile=no
|
--enable-guile=no
|
||||||
--enable-java=no
|
--enable-java=no
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- ../cmd-edgepaint-Makefile.am.orig 2020-03-28 14:17:47.357033245 +0100
|
|
||||||
+++ ./cmd/edgepaint/Makefile.am 2020-03-28 14:18:27.756954983 +0100
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
$(top_builddir)/lib/edgepaint/liblab_gamut.la \
|
|
||||||
$(top_builddir)/lib/cgraph/libcgraph.la \
|
|
||||||
$(top_builddir)/lib/cdt/libcdt.la \
|
|
||||||
- $(ANN_LIBS) -lstdc++ -lm
|
|
||||||
+ $(ANN_LIBS) -lc++_shared -lm
|
|
||||||
|
|
||||||
edgepaint.1.pdf: $(srcdir)/edgepaint.1
|
|
||||||
- @GROFF@ -e -Tps -man -t $(srcdir)/edgepaint.1 | @PS2PDF@ - - >edgepaint.1.pdf
|
|
|
@ -1,18 +1,15 @@
|
||||||
We don't have ps2pdf (ghostscript) in the docker image, and defaulting to false gives an error
|
--- ./configure.ac.orig 2021-12-02 18:23:18.329044250 +0530
|
||||||
--- ../configure.ac.orig 2020-07-21 20:56:45.916983567 +0000
|
+++ ./configure.ac 2021-12-02 18:24:54.019044213 +0530
|
||||||
+++ ./configure.ac 2020-07-21 20:58:06.050817612 +0000
|
@@ -279,9 +279,9 @@
|
||||||
@@ -282,10 +282,10 @@
|
|
||||||
AC_CHECK_PROGS(SED,gsed sed,false)
|
AC_CHECK_PROGS(SED,gsed sed,false)
|
||||||
AC_CHECK_PROGS(SORT,gsort sort,false)
|
AC_CHECK_PROGS(SORT,gsort sort,false)
|
||||||
|
|
||||||
-AC_CHECK_PROG(EGREP,egrep,egrep,false)
|
-AC_CHECK_PROG(EGREP,egrep,egrep,false)
|
||||||
-AC_CHECK_PROG(GROFF,groff,groff,false)
|
-AC_CHECK_PROG(GROFF,groff,groff,false)
|
||||||
-AC_CHECK_PROG(PS2PDF,ps2pdf,ps2pdf,false)
|
-AC_CHECK_PROGS(PS2PDF,ps2pdf pstopdf,false)
|
||||||
-AC_CHECK_PROG(PS2PDF,pstopdf,pstopdf,false)
|
|
||||||
+AC_CHECK_PROG(EGREP,egrep,egrep,echo)
|
+AC_CHECK_PROG(EGREP,egrep,egrep,echo)
|
||||||
+AC_CHECK_PROG(GROFF,groff,groff,echo)
|
+AC_CHECK_PROG(GROFF,groff,groff,echo)
|
||||||
+AC_CHECK_PROG(PS2PDF,ps2pdf,ps2pdf,echo)
|
+AC_CHECK_PROGS(PS2PDF,ps2pdf pstopdf,echo)
|
||||||
+AC_CHECK_PROG(PS2PDF,pstopdf,pstopdf,echo)
|
AM_CONDITIONAL(HAVE_PS2PDF,[test "x$PS2PDF" != xfalse])
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG
|
|
||||||
|
|
||||||
|
AC_ARG_ENABLE([man-pdfs],
|
||||||
|
|
|
@ -1,23 +1,20 @@
|
||||||
--- ../gvconfig.c.orig 2020-04-18 19:07:49.625114827 +0200
|
--- ./lib/gvc/gvconfig.c 2021-10-23 05:32:14.000000000 +0530
|
||||||
+++ ./lib/gvc/gvconfig.c 2020-04-18 19:16:04.460802577 +0200
|
+++ ./lib/gvc/gvconfig.c.mod 2021-12-08 16:35:08.084370882 +0530
|
||||||
@@ -393,7 +393,7 @@
|
@@ -383,7 +383,7 @@
|
||||||
char *plugin_re_end = "$";
|
}
|
||||||
|
len -= strlen(SUFFIX);
|
||||||
|
|
||||||
|
-#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
|
||||||
|
+#if (defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)) || defined(__ANDROID__)
|
||||||
|
// Windows libraries do not have a version in the filename
|
||||||
|
|
||||||
|
#elif defined(GVPLUGIN_VERSION)
|
||||||
|
@@ -433,7 +433,7 @@
|
||||||
|
return false;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
/* Everyone else */
|
- static const char SO[] = ".so.";
|
||||||
- char *plugin_re_beg = "\\.so\\.";
|
+ static const char SO[] = ".so";
|
||||||
+ char *plugin_re_beg = "\\.so";
|
if (len < strlen(SO)
|
||||||
char *plugin_re_end= "$";
|
|| strncmp(filepath + len - strlen(SO), SO, strlen(SO)) != 0) {
|
||||||
#endif
|
return false;
|
||||||
|
|
||||||
@@ -417,10 +417,8 @@
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
|
|
||||||
sprintf(config_re,"%s%s", plugin_re_beg, plugin_re_end);
|
|
||||||
-#elif defined(GVPLUGIN_VERSION)
|
|
||||||
- sprintf(config_re,"%s%d%s", plugin_re_beg, GVPLUGIN_VERSION, plugin_re_end);
|
|
||||||
#else
|
|
||||||
- sprintf(config_re,"%s[0-9]+%s", plugin_re_beg, plugin_re_end);
|
|
||||||
+ sprintf(config_re,"%s%s", plugin_re_beg, plugin_re_end);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (regcomp(&re, config_re, REG_EXTENDED|REG_NOSUB) != 0) {
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
--- ../cmd-dot-Makefile.am.orig 2020-03-28 15:09:39.244338000 +0100
|
--- ./cmd/dot/Makefile.am.orig 2021-12-02 18:35:30.719043970 +0530
|
||||||
+++ ./cmd/dot/Makefile.am 2020-03-28 15:10:03.697623920 +0100
|
+++ ./cmd/dot/Makefile.am 2021-12-02 18:36:09.779043955 +0530
|
||||||
@@ -58,7 +58,6 @@
|
@@ -76,7 +76,6 @@
|
||||||
# run "dot -c", if possible, to create plugin config
|
# run "dot -c", if possible, to create plugin config
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
(cd $(DESTDIR)$(bindir); if test -x dot$(EXEEXT); then for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot$(EXEEXT) $$i; done; fi;)
|
(cd $(DESTDIR)$(bindir); if test -x dot$(EXEEXT); then for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot$(EXEEXT) $$i; done; fi;)
|
||||||
- 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
|
- 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
|
||||||
|
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;)
|
(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;)
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -uNr graphviz-2.44.1/plugin/webp/Makefile.am graphviz-2.44.1.mod/plugin/webp/Makefile.am
|
|
||||||
--- graphviz-2.44.1/plugin/webp/Makefile.am 2020-06-29 11:47:18.000000000 +0300
|
|
||||||
+++ graphviz-2.44.1.mod/plugin/webp/Makefile.am 2020-08-09 22:58:32.615146633 +0300
|
|
||||||
@@ -26,7 +26,7 @@
|
|
||||||
|
|
||||||
libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
|
|
||||||
libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES)
|
|
||||||
-libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@
|
|
||||||
+libgvplugin_webp_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la @WEBP_LIBS@ @PANGOCAIRO_LIBS@
|
|
||||||
|
|
||||||
if WITH_WIN32
|
|
||||||
libgvplugin_webp_la_LDFLAGS += -no-undefined
|
|
Loading…
Reference in New Issue