graphviz: update to 5.0.0

This commit is contained in:
Tom Yan 2022-08-10 01:40:40 +08:00 committed by tomty89
parent 054a9ef9cc
commit 26f74bb65c
2 changed files with 14 additions and 12 deletions

View File

@ -1,28 +1,30 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025052b..59bc17d 100644
index f8e9583..b025115 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,9 +118,7 @@ if(with_zlib)
@@ -126,10 +126,8 @@ if(with_zlib)
find_package(ZLIB)
endif()
-if(UNIX)
- find_library(MATH_LIB m)
- find_library(MATH_LIB m)
- link_libraries(${MATH_LIB})
-endif()
+set(MATH_LIB -lm)
+link_libraries(${MATH_LIB})
if(WIN32)
# Find Windows specific dependencies
# Find Windows specific dependencies
diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index decab25..737a6fa 100644
index b437bde..34ebade 100644
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -76,6 +76,8 @@ if(ZLIB_FOUND)
target_link_libraries(gvc PUBLIC ${ZLIB_LIBRARIES})
@@ -75,6 +75,8 @@ if(ZLIB_FOUND)
target_link_libraries(gvc PUBLIC ${ZLIB_LIBRARIES})
endif()
+target_link_libraries(gvc PUBLIC -landroid-glob)
+
if(${with_ortho})
target_link_libraries(gvc PRIVATE
$<TARGET_OBJECTS:ortho_obj>
target_link_libraries(gvc PRIVATE
$<TARGET_OBJECTS:ortho_obj>

View File

@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.graphviz.org/
TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
TERMUX_PKG_LICENSE="EPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.50.0
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=5.0.0
#TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://gitlab.com/graphviz/graphviz/-/archive/$TERMUX_PKG_VERSION/graphviz-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=afa48581f764a35e148909cc96a0308ec2356b5225b64af12492f3392f20ef1c
TERMUX_PKG_SHA256=f8cc576694ae93659f453b6b4a4c2f04572a90cfccdca2d4271f2e7c60bb3d60
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib"
TERMUX_PKG_BREAKS="graphviz-dev"
TERMUX_PKG_REPLACES="graphviz-dev"