From 6298e7cb13f65d3434bb5355db09db2dd59f81d6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 31 May 2025 09:48:30 +0200 Subject: [PATCH] graphviz, bump to 12.2.1 (#12455) --- ...z-2.49.1.recipe => graphviz-12.2.1.recipe} | 44 ++++----- .../graphviz/patches/graphviz-2.49.1.patchset | 98 ------------------- 2 files changed, 20 insertions(+), 122 deletions(-) rename media-gfx/graphviz/{graphviz-2.49.1.recipe => graphviz-12.2.1.recipe} (86%) delete mode 100644 media-gfx/graphviz/patches/graphviz-2.49.1.patchset diff --git a/media-gfx/graphviz/graphviz-2.49.1.recipe b/media-gfx/graphviz/graphviz-12.2.1.recipe similarity index 86% rename from media-gfx/graphviz/graphviz-2.49.1.recipe rename to media-gfx/graphviz/graphviz-12.2.1.recipe index 8a77e586d..1281374c2 100644 --- a/media-gfx/graphviz/graphviz-2.49.1.recipe +++ b/media-gfx/graphviz/graphviz-12.2.1.recipe @@ -4,20 +4,21 @@ visualization is a way of representing structural information as diagrams of \ abstract graphs and networks. It has important applications in networking, \ bioinformatics, software engineering, database and web design, machine \ learning, and in visual interfaces for other technical domains. + The Graphviz layout programs take descriptions of graphs in a simple text \ language, and make diagrams in useful formats, such as images and SVG for web \ pages, PDF or Postscript for inclusion in other documents; or display in an \ -interactive graph browser. (Graphviz also supports GXL, an XML dialect.) +interactive graph browser. (Graphviz also supports GXL, an XML dialect). + Graphviz has many useful features for concrete diagrams, such as options for \ colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom \ shapes." HOMEPAGE="https://www.graphviz.org/" -COPYRIGHT="1994-2021 AT&T Corp." +COPYRIGHT="1994-2024 AT&T Corp." LICENSE="EPL v1.0" -REVISION="3" +REVISION="1" SOURCE_URI="https://gitlab.com/graphviz/graphviz/-/archive/$portVersion/graphviz-$portVersion.tar.bz2" -CHECKSUM_SHA256="c84e17cee66500aae992ffad05a218f6a9619c59d15198f2a9f26d39cebf2bfc" -PATCHES="graphviz-$portVersion.patchset" +CHECKSUM_SHA256="a990b38c3ea807a06597ce8d46d87878e59bb3fb12609fd98c02a861a4ca81b8" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -27,7 +28,6 @@ graphvizLibs="\ libcgraph \ libgvc \ libgvpr \ - liblab_gamut \ libpathplan \ libxdot \ " @@ -35,7 +35,6 @@ libcdtVersion="5.0.0" libcgraphVersion="6.0.0" libgvcVersion="6.0.0" libgvprVersion="2.0.0" -liblab_gamutVersion="1.0.0" libpathplanVersion="4.0.0" libxdotVersion="4.0.0" portVersionCompat="$portVersion compat >= 2" @@ -57,6 +56,7 @@ PROVIDES=" cmd:dot cmd:dot2gxl cmd:dot_builtins + cmd:dot_sandbox cmd:edgepaint cmd:fdp cmd:gc @@ -87,21 +87,21 @@ PROVIDES=" lib:libcgraph$secondaryArchSuffix = $libcgraphVersionCompat lib:libgvc$secondaryArchSuffix = $libgvcVersionCompat lib:libgvpr$secondaryArchSuffix = $libgvprVersionCompat - lib:liblab_gamut$secondaryArchSuffix = $liblab_gamutVersionCompat lib:libpathplan$secondaryArchSuffix = $libpathplanVersionCompat lib:libxdot$secondaryArchSuffix = $libxdotVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix - lib:libfontconfig$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix +# lib:libfontconfig$secondaryArchSuffix +# lib:libfreetype$secondaryArchSuffix +# lib:libfreetype$secondaryArchSuffix lib:libgd$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix +# lib:libjpeg$secondaryArchSuffix lib:libltdl$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix +# lib:libpng16$secondaryArchSuffix lib:libpython$pythonVersion$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -111,7 +111,6 @@ PROVIDES_devel=" devel:libcgraph$secondaryArchSuffix = $libcgraphVersionCompat devel:libgvc$secondaryArchSuffix = $libgvcVersionCompat devel:libgvpr$secondaryArchSuffix = $libgvprVersionCompat - devel:liblab_gamut$secondaryArchSuffix = $liblab_gamutVersionCompat devel:libpathplan$secondaryArchSuffix = $libpathplanVersionCompat devel:libxdot$secondaryArchSuffix = $libxdotVersionCompat " @@ -122,13 +121,14 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix - devel:libfontconfig$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix +# devel:libfontconfig$secondaryArchSuffix +# devel:libfreetype$secondaryArchSuffix devel:libgd$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix +# devel:libjpeg$secondaryArchSuffix devel:libltdl$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix +# devel:libpng16$secondaryArchSuffix devel:libpython$pythonVersion$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -145,7 +145,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix cmd:python3 cmd:swig - cmd:tclsh +# cmd:tclsh " defineDebugInfoPackage graphviz$secondaryArchSuffix \ @@ -187,7 +187,6 @@ defineDebugInfoPackage graphviz$secondaryArchSuffix \ $libDir/libcgraph.so.$libcgraphVersion \ $libDir/libgvc.so.$libgvcVersion \ $libDir/libgvpr.so.$libgvprVersion \ - $libDir/liblab_gamut.so.$liblab_gamutVersion \ $libDir/libpathplan.so.$libpathplanVersion \ $libDir/libxdot.so.$libxdotVersion @@ -211,6 +210,7 @@ INSTALL() #remove libtool files rm $libDir/*.la rm $libDir/graphviz/*.la + rm $libDir/graphviz/python3/*.la prepareInstalledDevelLibs $graphvizLibs fixPkgconfig @@ -225,8 +225,6 @@ INSTALL() $prefix/$relativeDevelopLibDir/pkgconfig/libgvc.pc sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \ $prefix/$relativeDevelopLibDir/pkgconfig/libgvpr.pc - sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \ - $prefix/$relativeDevelopLibDir/pkgconfig/liblab_gamut.pc sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \ $prefix/$relativeDevelopLibDir/pkgconfig/libpathplan.pc sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \ @@ -240,8 +238,6 @@ INSTALL() $prefix/$relativeDevelopLibDir/pkgconfig/libgvc.pc sed -i 's,\/headers,\/headers/graphviz,g' \ $prefix/$relativeDevelopLibDir/pkgconfig/libgvpr.pc - sed -i 's,\/headers,\/headers/graphviz,g' \ - $prefix/$relativeDevelopLibDir/pkgconfig/liblab_gamut.pc sed -i 's,\/headers,\/headers/graphviz,g' \ $prefix/$relativeDevelopLibDir/pkgconfig/libpathplan.pc sed -i 's,\/headers,\/headers/graphviz,g' \ diff --git a/media-gfx/graphviz/patches/graphviz-2.49.1.patchset b/media-gfx/graphviz/patches/graphviz-2.49.1.patchset deleted file mode 100644 index 65d259485..000000000 --- a/media-gfx/graphviz/patches/graphviz-2.49.1.patchset +++ /dev/null @@ -1,98 +0,0 @@ -From c412ef082197a591bcbce15241e1d3998fbe199a Mon Sep 17 00:00:00 2001 -From: begasus -Date: Wed, 29 Sep 2021 17:57:33 +0000 -Subject: Set default font for Haiku - - -diff --git a/lib/common/const.h b/lib/common/const.h -index 91fb980..54df290 100644 ---- a/lib/common/const.h -+++ b/lib/common/const.h -@@ -62,6 +62,8 @@ - #define MIN_FONTSIZE 1.0 - #if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED) - #define DEFAULT_FONTNAME "TimesNewRomanPSMT" -+elif defined (__HAIKU__) -+#define DEFAULT_FONTNAME "NotoSans" - #else - #define DEFAULT_FONTNAME "Times-Roman" - #endif --- -2.30.2 - - -From 69005818b814d28e3dfa26b967559d1c9de3da43 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Wed, 29 Sep 2021 17:59:31 +0000 -Subject: Add check for libnetwork - - -diff --git a/configure.ac b/configure.ac -index fe3f2be..8135833 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1474,6 +1474,9 @@ AC_ARG_WITH(extralibdir, - dnl ----------------------------------- - dnl ...borrow test for -lsocket -lnsl from tk8.3.3/unix/configure.in - -+dnl Check for Haiku libnetwork -+AC_CHECK_LIB([network], [socket]) -+ - save_LIBS=$LIBS - LIBS= - tk_checkBoth=0 --- -2.30.2 - - -From f32f872da01af05f843bcbddc39e92a5760b8df1 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Wed, 29 Sep 2021 18:02:07 +0000 -Subject: Set Haiku font directories - - -diff --git a/configure.ac b/configure.ac -index 8135833..81e810f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,6 +144,7 @@ UWIN=no - CYGWIN=no - MINGW32=no - DARWIN9=no -+HAIKU=no - case "${host_os}" in - *uwin* ) - UWIN=yes -@@ -185,6 +186,20 @@ case "${host_os}" in - ;; - esac - ;; -+ *haiku* ) -+ HAIKU=yes -+ HAIKU_SYSTEM_FONTPATH=`finddir B_SYSTEM_FONTS_DIRECTORY` -+ HAIKU_SYSTEM_NONPACKAGED_FONTPATH=`finddir B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY` -+ HAIKU_USER_FONTPATH=`finddir B_USER_FONTS_DIRECTORY` -+ HAIKU_USER_NONPACKAGED_FONTPATH=`finddir B_USER_NONPACKAGED_FONTS_DIRECTORY` -+ DEFAULT_FONTPATH="$HAIKU_SYSTEM_FONTPATH:$HAIKU_SYSTEM_FONTPATH/ttfonts:$HAIKU_SYSTEM_FONTPATH/psfonts" -+ DEFAULT_FONTPATH="$DEFAULT_FONTPATH:$HAIKU_SYSTEM_NONPACKAGED_FONTPATH:$HAIKU_SYSTEM_NONPACKAGED_FONTPATH/ttfonts:$HAIKU_SYSTEM_NONPACKAGED_FONTPATH/psfonts" -+ DEFAULT_FONTPATH="$DEFAULT_FONTPATH:$HAIKU_USER_FONTPATH:$HAIKU_USER_FONTPATH/ttfonts:$HAIKU_USER_FONTPATH/psfonts" -+ DEFAULT_FONTPATH="$DEFAULT_FONTPATH:$HAIKU_USER_NONPACKAGED_FONTPATH:$HAIKU_USER_NONPACKAGED_FONTPATH/ttfonts:$HAIKU_USER_NONPACKAGED_FONTPATH/psfonts" -+ PATHSEPARATOR=":" -+ NO_POSTSCRIPT_ALIAS=1 -+ BROWSER="open" -+ ;; - * ) # This sucks! Whatever happened to standards for file system layout? (Good job its no longer used unless fontconfig is unavailable.) - DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; - PATHSEPARATOR=":" -@@ -439,7 +454,7 @@ AC_CHECK_HEADERS( \ - unistd.h strings.h stat.h \ - sys/time.h sys/types.h sys/select.h sys/socket.h \ - sys/stat.h sys/mman.h \ -- sys/ioctl.h sys/inotify.h) -+ sys/ioctl.h sys/inotify.h sysexits.h) - - # Internationalization macros - # AM_GNU_GETTEXT --- -2.30.2 -