From 2a8d75c493a2c439d401b8d0d11cf231ca617d25 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 29 Jul 2015 14:22:36 +0100 Subject: [PATCH 1/2] Increase minimum pygobject version required to 3.12 --- README | 2 +- gramps/gui/grampsgui.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README b/README index c370380a0..ca938cb76 100644 --- a/README +++ b/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 diff --git a/gramps/gui/grampsgui.py b/gramps/gui/grampsgui.py index 09d117b74..2bcae0ddd 100644 --- a/gramps/gui/grampsgui.py +++ b/gramps/gui/grampsgui.py @@ -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")) From 5d5ca47863cd5c09d91bf0eec038ecea8730fb54 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 29 Jul 2015 19:02:55 +0100 Subject: [PATCH 2/2] 8701: GEDCOM version should be exported as 5.5.1 --- gramps/plugins/export/exportgedcom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/plugins/export/exportgedcom.py b/gramps/plugins/export/exportgedcom.py index 01dc48fde..668dc6d5e 100644 --- a/gramps/plugins/export/exportgedcom.py +++ b/gramps/plugins/export/exportgedcom.py @@ -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")