abiword/trunk/python-override.patch

   1 From 51787d61993cb3981c18e4cf174fc229734fba1e Mon Sep 17 00:00:00 2001
   2 From: Jean Brefort <jean.brefort@normalesup.org>
   3 Date: Sun, 6 Dec 2015 11:04:10 +0000
   4 Subject: [PATCH] Update python override code. Fixes #13745 and #13746, thanks
   5  to David Gutteridge.
   6
   7 git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35171 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
   8 ---
   9  src/gi-overrides/Abi.py      | 2 ++
  10  src/gi-overrides/Makefile.am | 2 +-
  11  2 files changed, 3 insertions(+), 1 deletion(-)
  12
  13 diff --git a/src/gi-overrides/Abi.py b/src/gi-overrides/Abi.py
  14 index 666fd61..e3b61b9 100644
  15 --- a/src/gi-overrides/Abi.py
  16 +++ b/src/gi-overrides/Abi.py
  17 @@ -1,4 +1,6 @@
  18  import sys
  19 +import gi
  20 +gi.require_version('Gtk', '3.0')
  21  from gi.repository import Gtk
  22  from ..overrides import override
  23  from ..importer import modules
  24 diff --git a/src/gi-overrides/Makefile.am b/src/gi-overrides/Makefile.am
  25 index 7fe3913..60f306d 100644
  26 --- a/src/gi-overrides/Makefile.am
  27 +++ b/src/gi-overrides/Makefile.am
  28 @@ -1,2 +1,2 @@
  29 -overridesdir = `python -c "import gi; print gi._overridesdir"`
  30 +overridesdir = `python -c "import gi; print(gi._overridesdir)"`
  31  overrides_PYTHON = Abi.py