[graphviz] Update to 14.1.2 (#49578)

ports/graphviz/build.diff

@@ -1,18 +1,3 @@
-diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
-index 245e44e04..3193c4d7f 100644
---- a/cmd/dot/CMakeLists.txt
-+++ b/cmd/dot/CMakeLists.txt
-@@ -174,6 +174,10 @@ else()
-     target_link_libraries(dot PRIVATE gvplugin_webp)
-   endif()
- 
-+  if(HAVE_QUARTZ)
-+    target_link_libraries(dot PRIVATE gvplugin_quartz)
-+  endif()
-+
-   install(
-     TARGETS dot
-     RUNTIME DESTINATION ${BINARY_INSTALL_DIR}
 diff --git a/cmd/gvpr/CMakeLists.txt b/cmd/gvpr/CMakeLists.txt
 index 7bca2427a..98b7016d7 100644
 --- a/cmd/gvpr/CMakeLists.txt
@@ -128,7 +113,7 @@ diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
 index 8530818a8..45a669e6a 100644
 --- a/lib/gvc/CMakeLists.txt
 +++ b/lib/gvc/CMakeLists.txt
-@@ -52,8 +52,9 @@ if(WIN32 AND NOT MINGW)
+@@ -53,8 +53,9 @@ if(WIN32 AND NOT MINGW)
    )
  endif()
  
@@ -139,7 +124,7 @@ index 8530818a8..45a669e6a 100644
    $<TARGET_OBJECTS:pack_obj>
  )
  
-@@ -61,7 +62,6 @@ target_link_libraries(gvc PRIVATE
+@@ -62,7 +63,6 @@ target_link_libraries(gvc PRIVATE
    cdt
    cgraph
    common
@@ -147,7 +132,7 @@ index 8530818a8..45a669e6a 100644
    util
  )
  
-@@ -78,10 +78,7 @@ if(ZLIB_FOUND)
+@@ -79,10 +79,7 @@ if(ZLIB_FOUND)
  endif()
  
  if(with_ortho)
@@ -170,7 +155,7 @@ index 35fccf805..eb3b50596 100644
  
  add_library(gvpr
    # Header files
-@@ -44,13 +46,16 @@ if(WIN32 AND NOT MINGW)
+@@ -45,13 +47,16 @@ if(WIN32 AND NOT MINGW)
    target_include_directories(gvpr PRIVATE ../../windows/include/unistd)
  endif()
  

ports/graphviz/dependencies.diff

@@ -115,7 +115,7 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
 index 65a357678..e656b1228 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -53,3 +53,6 @@ if(BUILD_SHARED_LIBS)
+@@ -59,3 +59,6 @@ if(BUILD_SHARED_LIBS)
      DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/graphviz
    )
  endif()
@@ -137,7 +137,7 @@ diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
 index 3b0e469f4..265de0354 100644
 --- a/lib/common/CMakeLists.txt
 +++ b/lib/common/CMakeLists.txt
-@@ -137,6 +137,9 @@ if(EXPAT_FOUND)
+@@ -136,6 +136,9 @@ if(EXPAT_FOUND)
      ${EXPAT_LIBRARIES}
    )
  endif()
@@ -147,7 +147,7 @@ index 3b0e469f4..265de0354 100644
  
  # Specify headers to be installed
  install(
-@@ -149,3 +152,5 @@ install(
+@@ -148,3 +151,5 @@ install(
      usershape.h
    DESTINATION ${HEADER_INSTALL_DIR}
  )
@@ -157,7 +157,7 @@ diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
 index 11dba53f3..1d54de861 100644
 --- a/lib/gvc/CMakeLists.txt
 +++ b/lib/gvc/CMakeLists.txt
-@@ -68,12 +68,17 @@ if(LTDL_FOUND)
+@@ -70,12 +70,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,8 +175,8 @@ index 11dba53f3..1d54de861 100644
  endif()
  
  if(with_ortho)
-@@ -159,3 +164,6 @@ if(BUILD_SHARED_LIBS)
-     DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/graphviz
+@@ -152,3 +157,6 @@ if(WIN32 AND ZLIB_FOUND AND install_win_dependency_dlls)
+     DESTINATION ${BINARY_INSTALL_DIR}
    )
  endif()
 +

ports/graphviz/install.diff

@@ -2,47 +2,18 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
 index e656b1228..41faad061 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -47,7 +47,13 @@ if(with_cxx_api)
+@@ -47,7 +47,10 @@ if(with_cxx_api)
    add_subdirectory(gvc++)
  endif()
  
 -if(BUILD_SHARED_LIBS)
 +if(1)
-+  set_target_properties(util PROPERTIES OUTPUT_NAME gvutil)
-+  install(TARGETS common util EXPORT private)
-+  install(EXPORT private
-+    NAMESPACE graphviz::private::
-+    DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/graphviz
-+  )
++  set_target_properties(common PROPERTIES EXPORT_NAME private::common)
++  set_target_properties(util   PROPERTIES EXPORT_NAME private::util OUTPUT_NAME gvutil)
++  install(TARGETS common util EXPORT graphvizTargets)
    install(
-     FILES graphvizConfig.cmake
-     DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/graphviz
-diff --git a/lib/cdt/CMakeLists.txt b/lib/cdt/CMakeLists.txt
-index 7110f1a79..f37d48414 100644
---- a/lib/cdt/CMakeLists.txt
-+++ b/lib/cdt/CMakeLists.txt
-@@ -71,7 +71,7 @@ set_target_properties(cdt PROPERTIES
-   SOVERSION 6
- )
- 
--if(BUILD_SHARED_LIBS)
-+if(1)
-   install(
-     EXPORT cdtConfig
-     FILE cdtConfig.cmake
-diff --git a/lib/cgraph/CMakeLists.txt b/lib/cgraph/CMakeLists.txt
-index d05d87a22..c267c5410 100644
---- a/lib/cgraph/CMakeLists.txt
-+++ b/lib/cgraph/CMakeLists.txt
-@@ -109,7 +109,7 @@ set_target_properties(cgraph PROPERTIES
-   SOVERSION 8
- )
- 
--if(BUILD_SHARED_LIBS)
-+if(1)
-   install(
-     EXPORT cgraphConfig
-     FILE cgraphConfig.cmake
+     EXPORT graphvizTargets
+     FILE graphvizTargets.cmake
 diff --git a/lib/cgraph/libcgraph.pc.in b/lib/cgraph/libcgraph.pc.in
 index 168ce85f0..9340aa32e 100644
 --- a/lib/cgraph/libcgraph.pc.in
@@ -52,31 +23,9 @@ index 168ce85f0..9340aa32e 100644
  Description: Graph library (file i/o, dot language parsing, graph, subgraph, node, edge, attribute, data structure manipulation)
  Version: @VERSION@
 -Libs.private: -lutil
-+Libs.private: -lgvprivate_util
++Libs.private: -lgvutil
  Libs: -L${libdir} -lcgraph -lcdt
  Cflags: -I${includedir} -I${includedir}/@PACKAGE@
-diff --git a/lib/graphvizConfig.cmake b/lib/graphvizConfig.cmake
-index e8c07cd73..2995c48a0 100644
---- a/lib/graphvizConfig.cmake
-+++ b/lib/graphvizConfig.cmake
-@@ -1,3 +1,4 @@
-+include(${CMAKE_CURRENT_LIST_DIR}/private.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/cdtConfig.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/cgraphConfig.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/gvcConfig.cmake)
-diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
-index 9f523354c..a6fb51f1d 100644
---- a/lib/gvc/CMakeLists.txt
-+++ b/lib/gvc/CMakeLists.txt
-@@ -158,7 +158,7 @@ if(WIN32 AND ZLIB_FOUND AND install_win_dependency_dlls)
-   )
- endif()
- 
--if(BUILD_SHARED_LIBS)
-+if(1)
-   install(
-     EXPORT gvcConfig
-     FILE gvcConfig.cmake
 diff --git a/lib/gvc/libgvc.pc.in b/lib/gvc/libgvc.pc.in
 index 9b89519f8..22ee26e4c 100644
 --- a/lib/gvc/libgvc.pc.in
@@ -90,45 +39,6 @@ index 9b89519f8..22ee26e4c 100644
  Libs: -L${libdir} -lgvc -lcgraph -lcdt
  Cflags: -I${includedir} -I${includedir}/@PACKAGE@
  
-diff --git a/lib/gvpr/CMakeLists.txt b/lib/gvpr/CMakeLists.txt
-index eb3b50596..0789fadd6 100644
---- a/lib/gvpr/CMakeLists.txt
-+++ b/lib/gvpr/CMakeLists.txt
-@@ -104,7 +104,7 @@ set_target_properties(gvpr PROPERTIES
-   SOVERSION 2
- )
- 
--if(BUILD_SHARED_LIBS)
-+if(1)
-   install(
-     EXPORT gvprConfig
-     FILE gvprConfig.cmake
-diff --git a/lib/pathplan/CMakeLists.txt b/lib/pathplan/CMakeLists.txt
-index 6dfc79ad6..31fff4e42 100644
---- a/lib/pathplan/CMakeLists.txt
-+++ b/lib/pathplan/CMakeLists.txt
-@@ -74,7 +74,7 @@ set_target_properties(pathplan PROPERTIES
-   SOVERSION 4
- )
- 
--if(BUILD_SHARED_LIBS)
-+if(1)
-   install(
-     EXPORT pathplanConfig
-     FILE pathplanConfig.cmake
-diff --git a/lib/xdot/CMakeLists.txt b/lib/xdot/CMakeLists.txt
-index 12788b3d8..e614c539c 100644
---- a/lib/xdot/CMakeLists.txt
-+++ b/lib/xdot/CMakeLists.txt
-@@ -60,7 +60,7 @@ set_target_properties(xdot PROPERTIES
-   SOVERSION 4
- )
- 
--if(BUILD_SHARED_LIBS)
-+if(1)
-   install(
-     EXPORT xdotConfig
-     FILE xdotConfig.cmake
 diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
 index 3eac7cd4d..9e41c2fd2 100644
 --- a/plugin/CMakeLists.txt

ports/graphviz/official-include-dir.diff

@@ -1,12 +0,0 @@
-diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
-index 1d54de861..116322e51 100644
---- a/lib/gvc/CMakeLists.txt
-+++ b/lib/gvc/CMakeLists.txt
-@@ -41,6 +41,7 @@ target_include_directories(gvc
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cgraph>
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../common>
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../pathplan>
-+    $<INSTALL_INTERFACE:include>
-     $<INSTALL_INTERFACE:include/graphviz>
-   PRIVATE
-     ../..

ports/graphviz/portfile.cmake

@@ -3,14 +3,13 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO graphviz/graphviz
     REF "${VERSION}"
-    SHA512 c486175bbdb62f6d8123ba9623921eb8948a472a2fa31c99f22775b383e6a6380a29224ae8e959617de8960c2a2ad346bb34b20dbf5bc780e5590f4f29930e23
+    SHA512 3f58d94750b80b527fdbdf3e745af514a80d5d1a6479768bae7ccfb94fe458dcca939a18c53de2ddc15bd464028efa473c777b5265ac787231526849a2232d56
     HEAD_REF main
     PATCHES
         build.diff
         dependencies.diff
         install.diff
         no-absolute-paths.patch
-        official-include-dir.diff  # https://gitlab.com/graphviz/graphviz/-/issues/2798
         skip-configure-plugins.diff
         version.diff
 )
@@ -77,9 +76,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKA
         "include(CMakeFindDependencyMacro)\nfind_dependency(getopt CONFIG)\n${cmake-config}"
     )
 endif()
-# Resolve cyclic dependency for static cmake targets. Hide from usage heuristics.
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/private.cmake" [[if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)]] "if(0)")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/private.cmake" [[add_library(]] "add_library(#[[skip-usage-heuristics]] ")
 
 if(VCPKG_TARGET_IS_WINDOWS)
     file(GLOB headers "${CURRENT_PACKAGES_DIR}/include/graphviz/*.h")

ports/graphviz/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "graphviz",
-  "version-semver": "14.1.1",
+  "version-semver": "14.1.2",
   "description": "Graph Visualization Tools",
   "homepage": "https://graphviz.org/",
   "license": "EPL-1.0",

versions/baseline.json

@@ -3497,7 +3497,7 @@
       "port-version": 4
     },
     "graphviz": {
-      "baseline": "14.1.1",
+      "baseline": "14.1.2",
       "port-version": 0
     },
     "greatest": {

versions/g-/graphviz.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9a0a6be01ac383809d760051b01106e99913cd8d",
+      "version-semver": "14.1.2",
+      "port-version": 0
+    },
     {
       "git-tree": "dbe3c4ae19c1ddebe17426e838183ddf8c6730e7",
       "version-semver": "14.1.1",