From 37bef367a4413fcdc4ecf260af6214eccc9bad22 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 18 May 2006 12:19:47 +0000 Subject: [PATCH] Clifford Wolf: Fixed graphviz gvconfig hotfix. [2006050416395528797] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7589 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/tschmidt/graphviz/graphviz.conf | 4 ++++ package/tschmidt/graphviz/gvconfig_hotfix.patch | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 package/tschmidt/graphviz/graphviz.conf diff --git a/package/tschmidt/graphviz/graphviz.conf b/package/tschmidt/graphviz/graphviz.conf new file mode 100644 index 000000000..b453285d9 --- /dev/null +++ b/package/tschmidt/graphviz/graphviz.conf @@ -0,0 +1,4 @@ + +# for gvconfig_hotfix.patch +export ROCK_BUILDING_GRAPHVIZ=1 + diff --git a/package/tschmidt/graphviz/gvconfig_hotfix.patch b/package/tschmidt/graphviz/gvconfig_hotfix.patch index de966d7af..19c89bb62 100644 --- a/package/tschmidt/graphviz/gvconfig_hotfix.patch +++ b/package/tschmidt/graphviz/gvconfig_hotfix.patch @@ -19,16 +19,17 @@ --- ./lib/gvc/gvconfig.c.orig 2005-08-18 11:25:03.000000000 +0200 +++ ./lib/gvc/gvconfig.c 2005-08-18 11:28:17.000000000 +0200 -@@ -235,7 +235,11 @@ +@@ -235,7 +235,12 @@ gvplugin_library_t *library; char *plugin_glob = "libgvplugin*.so.?"; - if (config_path) { + // this so-called "config file" should be in /var/cache, morrons! -+ // I'm going to change the config file location, so here is a little -+ // hack which skips updating the file when graphviz is called in a -+ // Build-Pkg process tree... - clifford -+ if (config_path && !getenv("ROCKCFG_ID")) { ++ // here is a little hack which skips updating the file when graphviz is ++ // called in a Build-Pkg process tree (unless when building graphviz). ++ // The variable ROCK_BUILDING_GRAPHVIZ must be set by the graphviz.conf ++ // script when building graphviz. - clifford ++ if (config_path && (!getenv("ROCKCFG_ID") || getenv("ROCK_BUILDING_GRAPHVIZ"))) { f = fopen(config_path,"w"); if (!f) { agerr(AGERR,"failed to open %s for write.\n", config_path);