From c6cbeafb28fc6c9c9711cf03080747257fcb59d4 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Mon, 19 Nov 2012 13:13:28 +0000
Subject: [PATCH] Prepare gramps.modules for 4.0 branch

svn: r20682
---
 mac/gramps.modules | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/mac/gramps.modules b/mac/gramps.modules
index ab8f03a94..4cb2c2e63 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -59,13 +59,13 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 
 
 
-  <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-unstable/gtk-osx.modules"/>
-  <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-unstable/gtk-osx.modules"/-->
+  <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+  <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
 
 
   <distutils id="gramps-svn" >
-    <branch module="gramps" repo="gramps"/>
+    <branch module="code" repo="gramps"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
       <dep package="librsvg"/>
@@ -81,22 +81,6 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </after>
   </distutils>
 
-  <distutils id="gramps-addons">
-    <branch module="branches/gramps32/contrib"
-	    repo="gramps-addons"/>
-    <dependencies>
-      <dep package="gramps"/>
-    </dependencies>
-  </distutils>
-
-  <autotools id="gramps33-addons" skip-autogen="true" >
-    <branch module="branches/gramps33/contrib"
-	    repo="gramps-addons"/>
-    <dependencies>
-      <dep package="gramps33"/>
-    </dependencies>
-  </autotools>
-
   <distutils id="gramps-addons-svn">
     <branch module="gramps-addons/trunk/contrib"
 	    repo="gramps-addons"/>
@@ -114,16 +98,6 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </autotools>
 
-<!-- Later versions of librsvg2 require libxml2-2.7, available only in
-     Snow Leopard 
-  <autotools id="librsvg2" >
-    <branch module="librsvg/2.22/librsvg-2.22.3.tar.bz2" version="2.22.3"
-	    repo="ftp.gnome.org"/>
-    <dependencies>
-      <dep package="libgsf"/>
-      <dep package="libart_lgpl"/>< goffice.modules >
-    </dependencies>
-  </autotools -->
 
   <distutils id="pyenchant">
     <branch repo="pymodules" module="p/pyenchant/pyenchant-1.6.1.tar.gz"
@@ -162,6 +136,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   <autotools id="graphviz" autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --with-pangocairo=yes --with-freetype2=no --with-fontconfig=no --with-included-ltdl=yes">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
     <dependencies>
+      <dep package="meta-gtk-osx-freetype"/>
       <dep package="pango"/>
       <dep package="zlib"/>
     </dependencies>