Release 4.0.3

Includes some module updates and fixups.

mac/Info.plist

@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>4.0.2, (C) 1997-2013 The Gramps Team http://www.gramps-project.org</string>
+    <string>4.0.3, (C) 1997-2014 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -15,15 +15,15 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundlePackageType</key>
-    <string>4.0.2</string>
+    <string>4.0.3</string>
     <key>CFBundleShortVersionString</key>
-    <string>4.0.2-1</string>
+    <string>4.0.3-1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>4.0.2-1</string>
+    <string>4.0.3-1</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2013 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2014 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.5</string>
 </dict>

mac/gramps.launcher

@@ -24,7 +24,9 @@ export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
 export PANGO_SYSCONFDIR="$bundle_etc"
 export PANGO_LIBDIR="$bundle_lib"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
+if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
+    export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
+fi
 export GI_TYPELIB_PATH="$bundle_lib/girepository-1.0"
 export GVBINDIR="$bundle_lib/graphviz"
 

mac/gramps.modules

@@ -27,8 +27,6 @@
 	      href="git://github.com/"/>
   <repository type="tarball" name="graphviz"
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
-  <repository type="tarball" name="yorba"
-	      href="http://yorba.org/download/"/>
   <repository type="tarball" name="exiv2.org"
 	      href="http://exiv2.org/"/>
   <repository type="tarball" name="pythonware"
@@ -66,7 +64,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 	    checkoutdir="gramps-git"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
-      <dep package="goocanvas"/>
+      <dep package="goocanvas2"/>
       <dep package="librsvg"/>
       <dep package="shared-mime-info"/>
       <dep package="hunspell"/>
@@ -80,11 +78,11 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </distutils>
 
   <distutils id="gramps" supports-non-srcdir-builds="no">
-    <branch module="gramps/gramps-4.0.2.tar.gz" version="4.0.2"
+    <branch module="gramps/gramps-4.0.3.tar.gz" version="4.0.3"
 	    repo="sourceforge"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
-      <dep package="goocanvas"/>
+      <dep package="goocanvas2"/>
       <dep package="librsvg"/>
       <dep package="shared-mime-info"/>
       <dep package="hunspell"/>
@@ -131,21 +129,13 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
  </autotools>
 
   <autotools id="osmgpsmap">
-    <branch module="nzjrs/osm-gps-map" revision="gtk3" repo="github"/>
+    <branch module="nzjrs/osm-gps-map" repo="github"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libsoup"/>
     </dependencies>
   </autotools>
 
-  <autotools id="goocanvas" autogen-sh="configure">
-    <branch module="goocanvas/2.0/goocanvas-2.0.1.tar.bz2" version="2.0.1"
-	    repo="ftp.gnome.org" hash="sha256:e7491c30325318d4f5fe2683eb63e6195b484b2f330c3f07c96bbb9213027773"/>
-    <dependencies>
-      <dep package="gtk+-3.0"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="graphviz" autogen-sh="configure"
 	     autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --with-pangocairo --with-included-ltdl=yes">
     <branch module="graphviz-2.28.0.tar.gz" version="2.28.0" repo="graphviz"/>
@@ -161,11 +151,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </autotools>
 
   <autotools id="gexiv2" autogen-sh="configure" supports-non-srcdir-builds="no"
-	     autogenargs="--enable-introspection"
+	     autogenargs="--enable-introspection --with-libtool=libtool"
 	     autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
-    <branch module="gexiv2/0.5/libgexiv2-0.5.0.tar.xz"
+    <branch module="gexiv2/0.7/gexiv2-0.7.0.tar.xz"
-	    repo="yorba" version="0.5.0">
+	    repo="ftp.gnome.org" version="0.7.0">
-      <patch file='gexiv2-libtool.patch' strip="1"/>
     </branch>
     <dependencies>
       <dep package="exiv2"/>