summaryrefslogtreecommitdiff
path: root/libre/abiword/python-override.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-04 19:43:49 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-04 19:44:56 -0300
commit80e9be5eab0b3b937102956a77949f2f597718fa (patch)
treeeb564cb8779a8130cd3d8369cf70c08c7afc2835 /libre/abiword/python-override.patch
parent1bc703b2b3137385ea6be7578026a1340377866f (diff)
abiword-3.0.1-7.parabola1: fix gi-overrides installation, install for both py2 and py3 - FS#49136 -> https://bugs.archlinux.org/task/49136
Diffstat (limited to 'libre/abiword/python-override.patch')
-rw-r--r--libre/abiword/python-override.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/libre/abiword/python-override.patch b/libre/abiword/python-override.patch
new file mode 100644
index 000000000..4cb58ad39
--- /dev/null
+++ b/libre/abiword/python-override.patch
@@ -0,0 +1,31 @@
+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