From 68f723804854a0238755258fa44789cfaf11d7ef Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sat, 10 Sep 2016 13:55:35 -0700
Subject: [PATCH] Add gir files to bundle.

Enables change of library paths in the typelibs to point at
@executable_path by gtk-mac-bundler.
---
 mac/Info.plist     |  6 +++---
 mac/gramps.bundle  | 13 +++++++++++--
 mac/gramps.modules |  6 +++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/mac/Info.plist b/mac/Info.plist
index 73dc38b6c..f72c7ed6e 100755
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Gramps-4.2.3, (C) 1997-2016 The Gramps Team http://www.gramps-project.org</string>
+    <string>Gramps-4.2.4, (C) 1997-2016 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>4.2.3</string>
+    <string>4.2.4</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Gramps-4.2.3-1</string>
+    <string>Gramps-4.2.4-1</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 1997 - 2016 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index 4ad31f4a7..6a3df3775 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -100,6 +100,11 @@
     ${prefix}/lib/libgexiv2.dylib
   </binary>
 
+  <gir>
+    ${prefix}/share/gir-1.0/*.gir
+  </gir>
+
+
 <!-- 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
@@ -159,9 +164,9 @@
     ${prefix}/include/python3.4m/pyconfig.h
   </data>
 
-  <data>
+  <!--data>
     ${prefix}/lib/girepository-1.0/
-  </data>
+  </data-->
 
  <!--data>
     ${prefix}/share/webkit-1.0/
@@ -175,6 +180,10 @@
     ${prefix}/share/mime/
   </data>
 
+  <data>
+    ${prefix}/share/xml/iso-codes
+  </data>
+
   <data recurse="True">
     ${prefix}/lib/python3.4/site-packages/gramps/*.glade
   </data>
diff --git a/mac/gramps.modules b/mac/gramps.modules
index 546cc9c97..741a7b127 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -67,9 +67,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </distutils>
 
   <distutils id="gramps" supports-non-srcdir-builds="no">
-    <branch module="gramps-project/gramps/archive/v4.2.3.tar.gz"
-	    repo="github-tarball" version="4.2.3"
-	    checkoutdir="gramps-gramps-4.2.3"/>
+    <branch module="gramps-project/gramps/archive/v4.2.4.tar.gz"
+	    repo="github-tarball" version="4.2.4"
+	    checkoutdir="gramps-gramps-4.2.4"/>
     <dependencies>
       <dep package="meta-python2-modules"/>
       <dep package="meta-python3-modules"/>