Merge branch 'maintenance/gramps42' of github.com:gramps-project/gramps into gramps42
This commit is contained in:
		
							
								
								
									
										2
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								README
									
									
									
									
									
								
							@@ -7,7 +7,7 @@ Requirements
 | 
			
		||||
The following packages *MUST* be installed in order for Gramps to work:
 | 
			
		||||
   Python 3.2 or greater
 | 
			
		||||
   GTK 3.10 or greater
 | 
			
		||||
   pygobject 3.3.2 or greater
 | 
			
		||||
   pygobject 3.12 or greater
 | 
			
		||||
   cairo, pango, pangocairo with introspection bindings (the gi packages)
 | 
			
		||||
   librsvg2 (svg icon view)
 | 
			
		||||
   xdg-utils
 | 
			
		||||
 
 | 
			
		||||
@@ -46,7 +46,7 @@ _ = glocale.translation.gettext
 | 
			
		||||
#
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
MIN_PYGOBJECT_VERSION = (3, 3, 2)
 | 
			
		||||
MIN_PYGOBJECT_VERSION = (3, 12, 0)
 | 
			
		||||
PYGOBJ_ERR = False
 | 
			
		||||
MIN_GTK_VERSION = (3, 10)
 | 
			
		||||
 | 
			
		||||
@@ -89,7 +89,7 @@ try:
 | 
			
		||||
except (ImportError, ValueError):
 | 
			
		||||
    print((_("Gdk, Gtk, Pango or PangoCairo typelib not installed.\n"
 | 
			
		||||
             "Install Gnome Introspection, and "
 | 
			
		||||
             "pygobject version 3.3.2 or later.\n"
 | 
			
		||||
             "pygobject version 3.12 or later.\n"
 | 
			
		||||
             "Then install introspection data for Gdk, Gtk, Pango and "
 | 
			
		||||
             "PangoCairo\n\n"
 | 
			
		||||
             "Gramps will terminate now.")))
 | 
			
		||||
@@ -333,9 +333,6 @@ def __startgramps(errors, argparser):
 | 
			
		||||
def startgtkloop(errors, argparser):
 | 
			
		||||
    """ We start the gtk loop and run the function to start up Gramps
 | 
			
		||||
    """
 | 
			
		||||
    if GObject.pygobject_version < (3, 10, 2):
 | 
			
		||||
        GObject.threads_init()
 | 
			
		||||
 | 
			
		||||
    GLib.timeout_add(100, __startgramps, errors, argparser, priority=100)
 | 
			
		||||
    if os.path.exists(os.path.join(DATA_DIR, "gramps.accel")):
 | 
			
		||||
        Gtk.AccelMap.load(os.path.join(DATA_DIR, "gramps.accel"))
 | 
			
		||||
 
 | 
			
		||||
@@ -333,7 +333,7 @@ class GedcomWriter(UpdateCallback):
 | 
			
		||||
        self._writeln(1, "FILE", filename, limit=255)
 | 
			
		||||
        self._writeln(1, "COPR", 'Copyright (c) %d %s.' % (year, rname))
 | 
			
		||||
        self._writeln(1, "GEDC")
 | 
			
		||||
        self._writeln(2, "VERS", "5.5")
 | 
			
		||||
        self._writeln(2, "VERS", "5.5.1")
 | 
			
		||||
        self._writeln(2, "FORM", 'LINEAGE-LINKED')
 | 
			
		||||
        self._writeln(1, "CHAR", "UTF-8")
 | 
			
		||||
        
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user