macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

graphviz-devel: update to 14.0.4

Browse Source 
See: https://trac.macports.org/ticket/72880
This commit is contained in:
Dave Allured
2025-11-25 09:45:57 -07:00
committed by GitHub
parent 51b954596a
commit 353142d2bc
3 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/graphviz-devel/Portfile
+6 -7
View File
@@ -7,10 +7,11 @@ PortGroup xcodeversion 1.0
name graphviz-devel
set my_name graphviz
version 12.2.1
checksums rmd160 75d7edc5d7fc12f75eb17d4ab85855d334bf78f5 \
sha256 242bc18942eebda6db4039f108f387ec97856fc91ba47f21e89341c34b554df8 \
size 26813453
version 14.0.4
checksums rmd160 4874bc696500e1f74125fcc6a40ab4f022f74649 \
sha256 a005977de2fec13753f5bde767cf97fdc28ac54bfd6a2737c563748bc4f32317 \
size 20957384
use_xz yes
set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} eq {} ? {-devel} : {}}]
@@ -78,8 +79,6 @@ depends_lib \
depends_run \
port:urw-fonts
patchfiles-append smyrna.patch
configure.args \
ac_cv_prog_AWK=/usr/bin/awk \
--disable-guile \
@@ -369,7 +368,7 @@ subport gvedit${thisbranch} {
PortGroup app 1.0
PortGroup qt5 1.0
revision 1
revision 0
conflicts gvedit${otherbranch}
graphics/graphviz-devel/files/patch-cmd-gvedit-Makefile.in.diff
+46 -8
View File
@@ -1,26 +1,64 @@
--- cmd/gvedit/Makefile.in.orig 2023-07-07 02:42:43.000000000 -0500
+++ cmd/gvedit/Makefile.in 2023-07-10 04:52:31.000000000 -0500
@@ -123,9 +123,7 @@
gvedit-mdichild.$(OBJEXT) $(am__objects_1)
gvedit_OBJECTS = $(am_gvedit_OBJECTS)
--- cmd/gvedit/Makefile.in.orig 2025-10-19 11:08:31
+++ cmd/gvedit/Makefile.in 2025-11-05 22:18:00
@@ -115,7 +115,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_gvedit_OBJECTS = gvedit-main.$(OBJEXT) gvedit-csettings.$(OBJEXT) \
gvedit-imageviewer.$(OBJEXT) gvedit-mainwindow.$(OBJEXT) \
- gvedit-mdichild.$(OBJEXT)
+ gvedit-mdichild.$(OBJEXT) gv_find_me.$(OBJEXT)
am__objects_1 = gvedit-moc_csettings.$(OBJEXT) \
gvedit-moc_imageviewer.$(OBJEXT) \
gvedit-moc_mainwindow.$(OBJEXT) gvedit-moc_mdichild.$(OBJEXT) \
@@ -123,10 +123,7 @@
nodist_gvedit_OBJECTS = $(am__objects_1)
gvedit_OBJECTS = $(am_gvedit_OBJECTS) $(nodist_gvedit_OBJECTS)
am__DEPENDENCIES_1 =
-gvedit_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la \
- $(top_builddir)/lib/cgraph/libcgraph.la \
- $(top_builddir)/lib/cdt/libcdt.la $(am__DEPENDENCIES_1) \
- $(top_builddir)/lib/cdt/libcdt.la \
- $(top_builddir)/lib/util/libutil_C.la $(am__DEPENDENCIES_1) \
+gvedit_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -620,9 +618,9 @@
-DDEMAND_LOADING=1
@@ -587,7 +584,8 @@
-I$(top_srcdir)/lib/gvc \
-I$(top_srcdir)/lib/pathplan \
-I$(top_srcdir)/lib/cgraph \
- -I$(top_srcdir)/lib/cdt
+ -I$(top_srcdir)/lib/cdt \
+ -I$(top_srcdir)/lib/util
gvedit_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@ -603,10 +601,9 @@
-DQT_USE_FAST_OPERATOR_PLUS
gvedit_LDADD = \
- $(top_builddir)/lib/gvc/libgvc.la \
- $(top_builddir)/lib/cgraph/libcgraph.la \
- $(top_builddir)/lib/cdt/libcdt.la \
- $(top_builddir)/lib/util/libutil_C.la \
+ -lgvc \
+ -lcgraph \
+ -lcdt \
$(QTGUI_LIBS) \
$(QTCORE_LIBS) \
$(EXPAT_LIBS) $(Z_LIBS)
@@ -897,6 +894,16 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvedit_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gvedit-qrc_mdi.obj `if test -f 'qrc_mdi.cpp'; then $(CYGPATH_W) 'qrc_mdi.cpp'; else $(CYGPATH_W) '$(srcdir)/qrc_mdi.cpp'; fi`
+# libutil_C.a is a temporary internal library, therefore not available
+# for standalone build of gvedit. Substitute by directly compiling
+# the single necessary source file.
+
+CC_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+gv_find_me.o:
+ $(CC_COMPILE) -c -o $@ ../../lib/util/gv_find_me.c
+
mostlyclean-libtool:
-rm -f *.lo
graphics/graphviz-devel/files/smyrna.patch
-17
View File
@@ -1,17 +0,0 @@
Fix build failure with +smyrna variant:
main.c:236:19: error: implicit declaration of function 'readln' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
https://gitlab.com/graphviz/graphviz/-/issues/2631
https://gitlab.com/graphviz/graphviz/-/commit/b215dbe2cbcfa3e76e242a444cf69aac54a7a046
--- cmd/smyrna/main.c.orig
+++ cmd/smyrna/main.c
@@ -178,7 +178,7 @@ static void windowedMode(int argc, char *argv[]) {
gtk_main();
}
-#if !defined(__APPLE__) && !defined(_WIN32)
+#ifndef _WIN32
/// `readlink`-alike but dynamically allocates
static char *readln(const char *path) {