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