python-override.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132
  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. git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35171 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
  7. ---
  8. src/gi-overrides/Abi.py | 2 ++
  9. src/gi-overrides/Makefile.am | 2 +-
  10. 2 files changed, 3 insertions(+), 1 deletion(-)
  11. diff --git a/src/gi-overrides/Abi.py b/src/gi-overrides/Abi.py
  12. index 666fd61..e3b61b9 100644
  13. --- a/src/gi-overrides/Abi.py
  14. +++ b/src/gi-overrides/Abi.py
  15. @@ -1,4 +1,6 @@
  16. import sys
  17. +import gi
  18. +gi.require_version('Gtk', '3.0')
  19. from gi.repository import Gtk
  20. from ..overrides import override
  21. from ..importer import modules
  22. diff --git a/src/gi-overrides/Makefile.am b/src/gi-overrides/Makefile.am
  23. index 7fe3913..60f306d 100644
  24. --- a/src/gi-overrides/Makefile.am
  25. +++ b/src/gi-overrides/Makefile.am
  26. @@ -1,2 +1,2 @@
  27. -overridesdir = `python -c "import gi; print gi._overridesdir"`
  28. +overridesdir = `python -c "import gi; print(gi._overridesdir)"`
  29. overrides_PYTHON = Abi.py