From 5bec86c1f479f5f33090d92fe74765ade19d3945 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Mon, 15 Jan 2018 07:27:43 -0800
Subject: [PATCH] Consolidate Python2 and Python3 meta-modules.

GObject-Introspection now works with Python3 so the split isn't needed any more.
---
 mac/gramps.modules | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/mac/gramps.modules b/mac/gramps.modules
index c5141aeed..13d5eae64 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -163,10 +163,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </distutils>
 
-  <metamodule id="meta-python2-modules">
+  <metamodule id="meta-gramps-modules">
     <dependencies>
-      <dep package="python"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="python3"/>
+      <dep package="meta-gtk-osx-gtk3.14"/>
       <dep package="meta-gtk-osx-gtk3-core-themes"/>
       <dep package="goocanvas2"/>
       <dep package="librsvg"/>
@@ -176,20 +176,15 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="osmgpsmap"/>
       <dep package="graphviz"/>
       <dep package="gexiv2"/>
-   </dependencies>
- </metamodule>
+      <dep package="berkeleydb"/>
+      <dep package="gtk-mac-integration-python"/>
+      <dep package="pycairo"/>
+      <dep package="pygobject3"/>
+      <dep package='pyicu'/>
+      <dep package='pybsddb'/>
+      <dep package="pil"/>
+    </dependencies>
+  </metamodule>
 
- <metamodule id="meta-python3-modules">
-   <dependencies>
-     <dep package="berkeleydb"/>
-     <dep package="python3"/>
-     <dep package="gtk-mac-integration-python"/>
-     <dep package="pycairo"/>
-     <dep package="pygobject3"/>
-     <dep package='pyicu'/>
-     <dep package='pybsddb'/>
-     <dep package="pil"/>
-   </dependencies>
- </metamodule>
 
 </moduleset>