From 7e7cf7d5530e4d444feba656df9f7df2f2bdb697 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 28 Jun 2011 18:54:40 +0000
Subject: [PATCH] OSX: Update dependencies to match Gramps-3.3.0 release notes.

svn: r17854
---
 mac/gramps.bundle  | 20 ++++++++++--------
 mac/gramps.modules | 51 ++++++++++++++++++++++++++++++++++++++++++----
 mac/launcher.sh    |  1 +
 3 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index 520bf9fe9..5625a7880 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -54,10 +54,6 @@
     ${prefix}/lib/librsvg-2.2.dylib
   </binary>
 
-  <binary>
-    ${prefix}/lib/libwebkit-1.0.2.dylib
-  </binary>
-
   <binary>
     ${prefix}/lib/libgoocanvas.3.dylib
   </binary>
@@ -98,6 +94,14 @@
     ${prefix}/lib/libtiff.3.dylib
   </binary>
 
+  <binary dest="${bundle}/Contents/MacOS/">
+    ${prefix}/bin/dot
+  </binary>
+
+  <binary>
+    ${prefix}/lib/graphviz/*.dylib
+  </binary>
+
 <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
@@ -121,10 +125,6 @@
     ${prefix}/share/gramps/
   </data>
 
-  <data>
-    ${prefix}/share/webkit-1.0/
-  </data>
-
   <data>
     ${prefix}/share/enchant/
   </data>
@@ -137,6 +137,10 @@
     ${prefix}/share/mime-info/
   </data>
 
+  <data>
+    ${prefix}/lib/graphviz/config6
+  </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 c612d6b43..25cbbd523 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -23,6 +23,12 @@
 	      href="http://pypi.python.org/packages/source/"/>
   <repository type="tarball" name="stowers"
 	     href="http://www.johnstowers.co.nz/files/"/>
+  <repository type="tarball" name="graphviz"
+	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
+  <repository type="tarball" name="launchpad"
+	      href="http://launchpad.net/"/>
+  <repository type="tarball" name="exiv2.org"
+	      href="http://exiv2.org/"/>
 
 <!--
 Special instructions:
@@ -78,30 +84,34 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <branch module="gramps" revision="maintenance/gramps33" repo="gramps"/>
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
-      <dep package="pyWebKitGtk"/>
       <dep package="librsvg2"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
-      <dep package="pyenchant"/>
       <dep package="hunspell"/>
       <dep package="pygtk-extras"/>
       <dep package="osmgpsmap-py"/>
+      <dep package="graphviz"/>
    </dependencies>
+   <after>
+      <dep package="pyexiv2"/>
+   </after>
   </autotools>
 
   <autotools id="gramps-svn" >
     <branch module="gramps" repo="gramps"/>
     <dependencies>
       <dep package="meta-gtk-osx-python"/>
-      <dep package="pyWebKitGtk"/>
       <dep package="librsvg2"/>
       <dep package="pygoocanvas"/>
       <dep package="shared-mime-info"/>
-      <dep package="pyenchant"/>
       <dep package="hunspell"/>
       <dep package="pygtk-extras"/>
       <dep package="osmgpsmap-py"/>
+      <dep package="graphviz"/>
    </dependencies>
+   <after>
+      <dep package="pyexiv2"/>
+   </after>
   </autotools>
 
   <distutils id="gramps-addons">
@@ -193,4 +203,37 @@ 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">
+    <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
+    <dependencies>
+      <dep package="pango"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="exiv2">
+    <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org" version="0.21.1"/>
+  </autotools>
+
+  <autotools id="boost">
+    <branch module="boost/boost_1_46_1.tar.bz2" repo="sourceforge"
+	    version="1.46.1"/>
+  </autotools>
+
+  <distutils id="scons">
+    <branch repo="sourceforge" module="scons/scons-2.0.1.tar.gz" version="2.0.1"/>
+  </distutils>
+
+  <autotools id="pyexiv2">
+    <branch module="pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2"
+	    repo="launchpad" version="0.3.0"/>
+    <dependencies>
+      <dep package="exiv2"/>
+      <dep package="scons"/>
+    </dependencies>
+    <after>
+      <dep package="boost"/>
+    </after>
+  </autotools>
+
 </moduleset>
diff --git a/mac/launcher.sh b/mac/launcher.sh
index 38c62aec1..fba95fe78 100755
--- a/mac/launcher.sh
+++ b/mac/launcher.sh
@@ -24,6 +24,7 @@ export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export GVBINDIR="$bundle_lib/graphviz"
 
 #Set $PYTHON to point inside the bundle
 export PYTHON="$bundle_contents/MacOS/python"