From f0641d505c19ae884573f649687fc8cc18c6df67 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Thu, 27 Dec 2012 20:45:26 +0000
Subject: [PATCH] Fix Graphviz installation

svn: r20853
---
 mac/gramps.bundle  |  4 ++++
 mac/gramps.modules | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index fe7388800..9636356b9 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -157,6 +157,10 @@
     ${prefix}/share/mime-info/
   </data>
 
+  <data>
+    ${prefix}/lib/graphviz/config*
+  </data>
+
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
   <data>
diff --git a/mac/gramps.modules b/mac/gramps.modules
index b56715fb3..d52e1c035 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -57,8 +57,8 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
 
 
-  <!--include href="https://raw.github.com/jralls/gtk-osx-build/master/modulesets-stable/gtk-osx.modules"/-->
-  <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+  <include href="https://raw.github.com/jralls/gtk-osx-build/master/modulesets-stable/gtk-osx.modules"/>
+  <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
 
   <autotools id="gramps" autogen-sh="configure">
@@ -68,7 +68,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
       <!--dep package="pyWebKitGtk"/-->
-      <dep package="librsvg2"/>
+      <dep package="librsvg"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
       <dep package="hunspell"/>
@@ -86,7 +86,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <branch module="code" revision="maintenance/gramps34" repo="gramps" />
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
-      <dep package="librsvg2"/>
+      <dep package="librsvg"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
       <dep package="hunspell"/>
@@ -166,9 +166,10 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </dependencies>
   </distutils>
 
-  <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --without-x --without-freetype2 --without-fontconfig --without-pangocairo --with-included-ltdl" autogen-sh="configure">
+  <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --without-x  --with-pangocairo --with-included-ltdl" autogen-sh="configure">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
     <dependencies>
+      <dep package="librsvg"/>
       <dep package="pango"/>
       <dep package="zlib"/>
     </dependencies>