[graphviz] Update to 15.0.0 (#52086)

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
2026-06-04 14:09:03 +08:00 · 2026-06-04 14:09:03 +08:00 · 000cc974fe
parent 0e032120a1
commit 000cc974fe
7 changed files with 95 additions and 91 deletions
--- a/ports/graphviz/build.diff
+++ b/ports/graphviz/build.diff
@ -1,14 +1,8 @@
 diff --git a/cmd/gvpr/CMakeLists.txt b/cmd/gvpr/CMakeLists.txt
-index 7bca2427a..98b7016d7 100644
+index 2a49d2c8b..98b7016d7 100644
 --- a/cmd/gvpr/CMakeLists.txt
 +++ b/cmd/gvpr/CMakeLists.txt
-@@ -1,5 +1,3 @@
-add_definitions(-DEXPORT_GVPR)
-
- add_executable(gvpr-bin
-   # Source files
-   gvprmain.c
-@@ -13,12 +11,9 @@ target_include_directories(gvpr-bin PRIVATE
+@@ -11,12 +11,9 @@ target_include_directories(gvpr-bin PRIVATE
 )
 
 target_link_libraries(gvpr-bin PRIVATE
@ -22,45 +16,48 @@ index 7bca2427a..98b7016d7 100644
 
 set_target_properties(gvpr-bin
 diff --git a/lib/ast/CMakeLists.txt b/lib/ast/CMakeLists.txt
-index a77af5574..000d71b77 100644
+index e6bbe8dff..7efb097f3 100644
 --- a/lib/ast/CMakeLists.txt
 +++ b/lib/ast/CMakeLists.txt
@@ -1,4 +1,4 @@
 -add_library(ast STATIC
 +add_library(ast OBJECT  # private in gvpr
-   # Header files
-   ast.h
-   error.h
+   chresc.c
+   chrtoi.c
+   error.c
 diff --git a/lib/cdt/CMakeLists.txt b/lib/cdt/CMakeLists.txt
-index ed192dac8..7110f1a79 100644
+index 8ec7cd1f0..3a8f84f89 100644
 --- a/lib/cdt/CMakeLists.txt
 +++ b/lib/cdt/CMakeLists.txt
-@@ -1,4 +1,6 @@
+@@ -16,7 +16,9 @@ add_library(cdt
+   dtwalk.c
+ )
+ 
 +if(BUILD_SHARED_LIBS)
- add_definitions(-DEXPORT_CDT)
+ target_compile_definitions(cdt PRIVATE EXPORT_CDT)
 +endif()
 
- add_library(cdt
-   # Header files
+ target_include_directories(cdt PRIVATE
+   ..
 diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt
-index 794b5c186..d05d87a22 100644
+index e2b76f9f6..3bf51a6ed 100644
 --- a/lib/cgraph/CMakeLists.txt
 +++ b/lib/cgraph/CMakeLists.txt
-@@ -7,7 +7,9 @@ FLEX_TARGET(Scan
- )
- ADD_FLEX_BISON_DEPENDENCY(Scan Grammar)
+@@ -43,7 +43,9 @@ if(HAVE_C_WUNUSED_BUT_SET_VARIABLE)
+     PROPERTIES COMPILE_FLAGS -Wno-unused-but-set-variable)
+ endif()
 
 +if(BUILD_SHARED_LIBS)
- add_definitions(-DEXPORT_CGRAPH -DEXPORT_CGHDR)
+ target_compile_definitions(cgraph PRIVATE EXPORT_CGRAPH EXPORT_CGHDR)
 +endif()
- if(WIN32 AND NOT MINGW)
-   add_definitions(-DYY_NO_UNISTD_H)
- endif()
+ 
+ target_include_directories(cgraph
+   PUBLIC
 diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
-index be815ef72..0a6c703dc 100644
+index bf37ff92f..3626aa0d9 100644
 --- a/lib/common/CMakeLists.txt
 +++ b/lib/common/CMakeLists.txt
-@@ -122,20 +122,17 @@ if(APPLE)
+@@ -103,20 +103,17 @@ if(APPLE)
   target_compile_options(common_obj PRIVATE "-fno-common")
 endif()
 
@ -86,10 +83,10 @@ index be815ef72..0a6c703dc 100644
   )
 endif()
 diff --git a/lib/dotgen/CMakeLists.txt b/lib/dotgen/CMakeLists.txt
-index e7802eb46..931a18b1f 100644
+index cf02ab457..84cafa181 100644
 --- a/lib/dotgen/CMakeLists.txt
 +++ b/lib/dotgen/CMakeLists.txt
-@@ -35,5 +35,6 @@ target_include_directories(dotgen PRIVATE
+@@ -29,5 +29,6 @@ target_include_directories(dotgen PRIVATE
 
 target_link_libraries(dotgen PRIVATE
   cgraph
@ -97,7 +94,7 @@ index e7802eb46..931a18b1f 100644
   util
 )
 diff --git a/lib/expr/CMakeLists.txt b/lib/expr/CMakeLists.txt
-index 452ecc9c2..fbb1f99e5 100644
+index 5e949ff14..95359f59e 100644
 --- a/lib/expr/CMakeLists.txt
 +++ b/lib/expr/CMakeLists.txt
@@ -5,7 +5,7 @@ BISON_TARGET(
@ -106,14 +103,14 @@ index 452ecc9c2..fbb1f99e5 100644
 
 -add_library(expr STATIC
 +add_library(expr OBJECT  # private in gvpr
-   # Header files
-   exgram.h
-   exlib.h
+   # Source files
+   excc.c
+   excontext.c
 diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
-index 8530818a8..45a669e6a 100644
+index 100df84cf..985d24851 100644
 --- a/lib/gvc/CMakeLists.txt
 +++ b/lib/gvc/CMakeLists.txt
-@@ -53,8 +53,9 @@ if(WIN32 AND NOT MINGW)
+@@ -38,8 +38,9 @@ if(WIN32 AND NOT MINGW)
   )
 endif()
 
@ -124,7 +121,7 @@ index 8530818a8..45a669e6a 100644
   $<TARGET_OBJECTS:pack_obj>
 )
 
-@@ -62,7 +63,6 @@ target_link_libraries(gvc PRIVATE
+@@ -47,7 +48,6 @@ target_link_libraries(gvc PRIVATE
   cdt
   cgraph
   common
@ -132,7 +129,7 @@ index 8530818a8..45a669e6a 100644
   util
 )
 
-@@ -79,10 +79,7 @@ if(ZLIB_FOUND)
+@@ -64,10 +64,7 @@ if(ZLIB_FOUND)
 endif()
 
 if(with_ortho)
@ -145,17 +142,20 @@ index 8530818a8..45a669e6a 100644
 
 # Installation location of library files
 diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt
-index 35fccf805..eb3b50596 100644
+index ed32e9cb5..20f4057c7 100644
 --- a/lib/gvpr/CMakeLists.txt
 +++ b/lib/gvpr/CMakeLists.txt
-@@ -1,4 +1,6 @@
+@@ -6,7 +6,9 @@ add_library(gvpr
+   parse.c
+ )
+ 
 +if(BUILD_SHARED_LIBS)
- add_definitions(-DEXPORT_GVPR)
+ target_compile_definitions(gvpr PRIVATE EXPORT_GVPR)
 +endif()
 
- add_library(gvpr
-   # Header files
-@@ -45,13 +47,16 @@ if(WIN32 AND NOT MINGW)
+ target_include_directories(gvpr
+   PUBLIC
+@@ -34,13 +36,16 @@ if(WIN32 AND NOT MINGW)
   target_include_directories(gvpr PRIVATE ../../windows/include/unistd)
 endif()
 
@ -176,22 +176,20 @@ index 35fccf805..eb3b50596 100644
 
 if(NOT HAVE_GETOPT_H)
 diff --git a/lib/label/CMakeLists.txt b/lib/label/CMakeLists.txt
-index a9f690150..aa33a6871 100644
+index 834a9f7e5..6600d76c9 100644
 --- a/lib/label/CMakeLists.txt
 +++ b/lib/label/CMakeLists.txt
-@@ -1,6 +1,6 @@
- add_definitions(-DGVC_EXPORTS)
- 
+@@ -1,4 +1,4 @@
 -add_library(label STATIC
 +add_library(label OBJECT  # export with gvc
-   # Header files
-   index.h
-   node.h
+   index.c
+   node.c
+   rectangle.c
 diff --git a/lib/ortho/CMakeLists.txt b/lib/ortho/CMakeLists.txt
-index 7c2b83832..62f1bc5d7 100644
+index 0a22c418b..5b6f77cc3 100644
 --- a/lib/ortho/CMakeLists.txt
 +++ b/lib/ortho/CMakeLists.txt
-@@ -35,10 +35,7 @@ target_include_directories(ortho_obj PRIVATE
+@@ -24,10 +24,7 @@ target_include_directories(ortho_obj PRIVATE
 
 target_link_libraries(ortho_obj PRIVATE util)
 
@ -205,10 +203,10 @@ index 7c2b83832..62f1bc5d7 100644
 
 endif()
 diff --git a/lib/pack/CMakeLists.txt b/lib/pack/CMakeLists.txt
-index 585fefe9f..13e2eb99e 100644
+index c7e1acd4b..0458180fe 100644
 --- a/lib/pack/CMakeLists.txt
 +++ b/lib/pack/CMakeLists.txt
-@@ -21,11 +21,9 @@ target_include_directories(pack_obj PRIVATE
+@@ -17,11 +17,9 @@ target_include_directories(pack_obj PRIVATE
 
 target_link_libraries(pack_obj PRIVATE util)
 
@ -224,23 +222,26 @@ index 585fefe9f..13e2eb99e 100644
 # Specify headers to be installed
 install(
 diff --git a/lib/sfio/CMakeLists.txt b/lib/sfio/CMakeLists.txt
-index d92a13201..237872715 100644
+index fe95440b4..ee6166d1f 100644
 --- a/lib/sfio/CMakeLists.txt
 +++ b/lib/sfio/CMakeLists.txt
@@ -1,4 +1,4 @@
 -add_library(sfio STATIC
 +add_library(sfio OBJECT  # private in gvpr
-   # Header files
-   sfhdr.h
-   sfio.h
+   sfcvt.c
+   sfextern.c
+   sftable.c
 diff --git a/lib/xdot/CMakeLists.txt b/lib/xdot/CMakeLists.txt
-index 70a317d72..12788b3d8 100644
+index 2f02b2415..dc91c67ef 100644
 --- a/lib/xdot/CMakeLists.txt
 +++ b/lib/xdot/CMakeLists.txt
-@@ -1,4 +1,6 @@
+@@ -2,7 +2,9 @@ add_library(xdot
+   xdot.c
+ )
+ 
 +if(BUILD_SHARED_LIBS)
- add_definitions(-DEXPORT_XDOT)
+ target_compile_definitions(xdot PRIVATE EXPORT_XDOT)
 +endif()
 
- add_library(xdot
-   # Header files
+ target_include_directories(xdot
+   PUBLIC
--- a/ports/graphviz/dependencies.diff
+++ b/ports/graphviz/dependencies.diff
@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b02632b1f..cce1f3e9b 100644
+index 1cc5cf112..0858bebc6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -327,8 +327,8 @@ if(PkgConfig_FOUND)
@ -13,18 +13,14 @@ index b02632b1f..cce1f3e9b 100644
   if(AUTO_POPPLER)
     pkg_check_modules(POPPLER poppler-glib)
   elseif(WITH_POPPLER)
-@@ -682,7 +682,13 @@ endif()
+@@ -681,8 +681,8 @@ if(NOT ENABLE_RUBY STREQUAL "OFF")
+ endif()
 
 if(UNIX)
-   find_library(MATH_LIB m)
+-  find_library(MATH_LIB m)
 -  link_libraries(${MATH_LIB})
-+  if(MATH_LIB)
-+    set(MATH_LIB m CACHE INTERNAL "")
-+    link_libraries(${MATH_LIB})
-+    string(APPEND LIBGVC_PC_LIBS_PRIVATE " -lm")
-+  else()
-+    set(MATH_LIB "")
-+  endif()
+  link_libraries(m)
+  string(APPEND LIBGVC_PC_LIBS_PRIVATE " -lm")
 endif()
 
 if(WIN32)
@ -47,7 +43,7 @@ index a6fdf8e3c..a4690653b 100644
   find_program(EXPAT_RUNTIME_LIBRARY NAMES libexpat-1.dll)
   find_program(FONTCONFIG_RUNTIME_LIBRARY NAMES libfontconfig-1.dll)
 diff --git a/cmake/FindGD.cmake b/cmake/FindGD.cmake
-index 49d372c37..2ed7e42af 100644
+index 33e037d26..d360f361f 100644
 --- a/cmake/FindGD.cmake
 +++ b/cmake/FindGD.cmake
@@ -1,3 +1,11 @@
@ -112,7 +108,7 @@ index d185f0bf7..222789a96 100644
 
   find_program(GOBJECT_RUNTIME_LIBRARY NAMES libgobject-2.0-0.dll)
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 65a357678..e656b1228 100644
+index bbec3faca..64a5dde8d 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
@@ -59,3 +59,6 @@ if(BUILD_SHARED_LIBS)
@ -134,10 +130,10 @@ index 2b8c8f47b..168ce85f0 100644
 Libs: -L${libdir} -lcgraph -lcdt
 Cflags: -I${includedir} -I${includedir}/@PACKAGE@
 diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
-index 3b0e469f4..265de0354 100644
+index bf37ff92f..0cd013774 100644
 --- a/lib/common/CMakeLists.txt
 +++ b/lib/common/CMakeLists.txt
-@@ -136,6 +136,9 @@ if(EXPAT_FOUND)
+@@ -120,6 +120,9 @@ if(EXPAT_FOUND)
     ${EXPAT_LIBRARIES}
   )
 endif()
@ -147,17 +143,17 @@ index 3b0e469f4..265de0354 100644
 
 # Specify headers to be installed
 install(
-@@ -148,3 +151,5 @@ install(
+@@ -132,3 +135,5 @@ install(
     usershape.h
   DESTINATION ${HEADER_INSTALL_DIR}
 )
 +
 +set(LIBGVC_PC_REQUIRES_PRIVATE "${LIBGVC_PC_REQUIRES_PRIVATE}" PARENT_SCOPE)
 diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
-index 11dba53f3..1d54de861 100644
+index 100df84cf..4a373406c 100644
 --- a/lib/gvc/CMakeLists.txt
 +++ b/lib/gvc/CMakeLists.txt
-@@ -70,12 +70,17 @@ if(LTDL_FOUND)
+@@ -55,12 +55,17 @@ if(LTDL_FOUND)
   target_include_directories(gvc SYSTEM PRIVATE ${LTDL_INCLUDE_DIRS})
   if(NOT WIN32 OR MINGW)
     target_link_libraries(gvc PUBLIC ${LTDL_LIBRARIES})
@ -175,7 +171,7 @@ index 11dba53f3..1d54de861 100644
 endif()
 
 if(with_ortho)
-@@ -152,3 +157,6 @@ if(WIN32 AND ZLIB_FOUND AND install_win_dependency_dlls)
+@@ -140,3 +145,6 @@ if(WIN32 AND ZLIB_FOUND AND install_win_dependency_dlls)
     DESTINATION ${BINARY_INSTALL_DIR}
   )
 endif()
--- a/ports/graphviz/no-absolute-paths.patch
+++ b/ports/graphviz/no-absolute-paths.patch
@ -1,10 +1,13 @@
 diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
-index b437bde..04fe8e8 100644
+index 100df84cf..2885417f0 100644
 --- a/lib/gvc/CMakeLists.txt
 +++ b/lib/gvc/CMakeLists.txt
-@@ -1,4 +1,4 @@
-add_definitions(-DGVC_EXPORTS -DGVLIBDIR="${LIBRARY_INSTALL_DIR}/graphviz")
-+add_definitions(-DGVC_EXPORTS -DGVLIBDIR="")
+@@ -15,7 +15,7 @@ add_library(gvc
+ )
 
- add_library(gvc
-   # Header files
+ target_compile_definitions(gvc
+-  PRIVATE GVC_EXPORTS GVLIBDIR="${LIBRARY_INSTALL_DIR}/graphviz"
+  PRIVATE GVC_EXPORTS GVLIBDIR=""
+ )
+ 
+ target_include_directories(gvc
--- a/ports/graphviz/portfile.cmake
+++ b/ports/graphviz/portfile.cmake
@ -3,7 +3,7 @@ vcpkg_from_gitlab(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO graphviz/graphviz
    REF "${VERSION}"
-    SHA512 3f58d94750b80b527fdbdf3e745af514a80d5d1a6479768bae7ccfb94fe458dcca939a18c53de2ddc15bd464028efa473c777b5265ac787231526849a2232d56
+    SHA512 d69e2dd7b5127650b6e09de92508a84886d52d5dfd1eacf9e6abb797ca231db3c1b12546c7b8561e311150cd62be8dfea689021b7d139ffcdb3d4e16da670352
    HEAD_REF main
    PATCHES
        build.diff
@ -115,7 +115,6 @@ if("tools" IN_LIST FEATURES)
            ccomps
            circo
            cluster
-            diffimg
            dijkstra
            dot
            edgepaint
--- a/ports/graphviz/vcpkg.json
+++ b/ports/graphviz/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "graphviz",
-  "version-semver": "14.1.2",
+  "version-semver": "15.0.0",
  "description": "Graph Visualization Tools",
  "homepage": "https://graphviz.org/",
  "license": "EPL-1.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -3569,7 +3569,7 @@
      "port-version": 4
    },
    "graphviz": {
-      "baseline": "14.1.2",
+      "baseline": "15.0.0",
      "port-version": 0
    },
    "greatest": {
--- a/versions/g-/graphviz.json
+++ b/versions/g-/graphviz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2726b788113c4b83e3058a7e949e6fb05b909b36",
+      "version-semver": "15.0.0",
+      "port-version": 0
+    },
    {
      "git-tree": "9a0a6be01ac383809d760051b01106e99913cd8d",
      "version-semver": "14.1.2",