Merge from gramps50

2018-07-12 11:10:22 -05:00
parent 9e61809b17 60ba912100
commit 257275f169
114 changed files with 218067 additions and 195958 deletions
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
    <key>CFBundleExecutable</key>
    <string>Gramps</string>
    <key>CFBundleGetInfoString</key>
-    <string>master, (C) 1997-2016 The Gramps Team http://www.gramps-project.org</string>
+    <string>master, (C) 1997-2018 The Gramps Team http://www.gramps-project.org</string>
    <key>CFBundleIconFile</key>
    <string>gramps.icns</string>
    <key>CFBundleIdentifier</key>
@@ -23,10 +23,12 @@
    <key>CFBundleVersion</key>
    <string>Master</string>
    <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2016 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2018 The Gramps Team, GNU General Public License.</string>
    <key>LSMinimumSystemVersion</key>
-    <string>10.5</string>
+    <string>10.8</string>
    <key>GtkOSXLaunchScriptFile</key>
    <string>gramps_launcher.py</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
 </dict>
 </plist>
--- a/mac/gramps.accel
+++ b/mac/gramps.accel
@@ -33,7 +33,7 @@
 ; (gtk_accel_path "<Actions>/FileWindow/Open" "<Primary>o")
 ; (gtk_accel_path "<Actions>/ReportWindow/endofline_report" "")
 (gtk_accel_path "<Actions>/MainWindow/CitationAdd" "<Shift><ctrl><alt>c")
-; (gtk_accel_path "<Actions>/UndoHistory/UndoHistory" "<Primary>h")
+ (gtk_accel_path "<Actions>/UndoHistory/UndoHistory" "<shift><Meta>h")
 ; (gtk_accel_path "<Actions>/ReportWindow/family_descend_chart" "")
 (gtk_accel_path "<Actions>/AllMainWindow/Close" "<Primary>w")
 ; (gtk_accel_path "<Actions>/FileWindow/HelpMenu" "")
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -18,11 +18,11 @@
  <repository type="tarball" name="oracle"
 	      href="http://download.oracle.com/"/>
  <repository type="tarball" name="pymodules"
-	      href="http://pypi.python.org/packages/"/>
+	      href="https://pypi.python.org/packages/"/>
  <repository type="tarball" name="stowers"
 	     href="http://www.johnstowers.co.nz/files/"/>
-  <repository type="git" name="github"
-	      href="git://github.com/"/>
+  <repository type="git" name="github" href="git://github.com/"/>
+  <repository type="tarball" name="github-tarball" href="https://github.com/"/>
  <repository type="tarball" name="graphviz"
 	      href="http://www.graphviz.org/pub/graphviz/stable/SOURCES/"/>
  <repository type="tarball" name="exiv2.org"
@@ -57,16 +57,23 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle

  <distutils id="gramps-git" supports-non-srcdir-builds="no">
    <branch module="gramps-project/gramps.git" repo="github"
+            revision="maintenance/gramps50"
 	    checkoutdir="gramps-git"/>
    <dependencies>
-      <dep package="meta-python2-modules"/>
-      <dep package="meta-python3-modules"/>
    </dependencies>
  </distutils>

-  <distutils id="gramps-addons-svn">
-    <branch module="gramps-addons/trunk/contrib"
-	    repo="gramps-addons"/>
+ <distutils id="gramps" supports-non-srcdir-builds="no">
+    <branch module="gramps-project/gramps/archive/v5.0.0-rc1.tar.gz"
+	    repo="github-tarball" version="5.0.0"
+	    checkoutdir="gramps-gramps-5.0.0-rc1"/>
+    <dependencies>
+    </dependencies>
+  </distutils>
+
+  <distutils id="gramps-addons-git">
+    <branch module="gramps-project/gramps-addons"
+	    repo="github"/>
    <dependencies>
      <dep package="gramps-git"/>
    </dependencies>
@@ -100,16 +107,19 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
  <autotools id="osmgpsmap" skip-autogen="never"
 	     autogenargs="--disable-gtk-doc-html"
 	     supports-non-srcdir-builds="no">
-    <branch module="nzjrs/osm-gps-map" revision="1.0.2" repo="github"/>
+    <branch module="nzjrs/osm-gps-map" revision="1.1.0" repo="github"/>
    <dependencies>
-      <dep package="meta-gtk-osx-gtk3"/>
      <dep package="libsoup"/>
    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gtk-osx-gtk3.14"/>
+    </after>
  </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">
-    <branch module="graphviz-2.38.0.tar.gz" version="2.38.0" repo="graphviz"/>
+    <branch module="graphviz-2.40.1.tar.gz" version="2.40.1" repo="graphviz"/>
    <dependencies>
      <dep package="pango"/>
      <dep package="meta-gtk-osx-freetype"/>
@@ -117,16 +127,17 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
    </dependencies>
  </autotools>

-  <autotools id="exiv2" supports-non-srcdir-builds="no">
-    <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org" version="0.21.1"/>
+  <autotools id="exiv2"  supports-non-srcdir-builds="no">
+    <branch module="exiv2-0.21.1.tar.gz" repo="exiv2.org"
+            version="0.21.1"/>
  </autotools>

  <autotools id="gexiv2" autogen-sh="configure" supports-non-srcdir-builds="no"
 	     autogenargs="--enable-introspection --with-libtool=libtool"
 	     autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
-    <branch module="gexiv2/0.10/gexiv2-0.10.5.tar.xz"
-            repo="ftp.gnome.org" version="0.10.5"
-            hash="sha256:318fe068cd414c0af91759a87c29fd577cd5d42bf7a6f50caff27535c02ac7f3">
+    <branch module="gexiv2/0.10/gexiv2-0.10.6.tar.xz"
+            repo="ftp.gnome.org" version="0.10.6"
+            hash="sha256:132788919667254b42c026ab39ab3c3a5be59be8575c05fa4b371ca8aed55825">
    </branch>
    <dependencies>
      <dep package="exiv2"/>
@@ -144,17 +155,17 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
  </distutils>

 <distutils id='pyicu'>
-    <branch version='1.9' repo='pymodules'
-	    module='6e/88/f42a1297909ca6d9113ba37b37067011ae29432fe592fdd98cf52ad23b77/PyICU-1.9.7.tar.gz'/>
+    <branch version='2.0.3' repo='pymodules'
+	    module='bb/ef/3a7fcbba81bfd213e479131ae21445a2ddd14b46d70ef0109640b580bc5d/PyICU-2.0.3.tar.gz'/>
    <dependencies>
      <dep package='icu'/>
    </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"/>
@@ -164,19 +175,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="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>