diff options
Diffstat (limited to 'games-board/pysolfc/files/pysolfc-PIL-imports.patch')
-rw-r--r-- | games-board/pysolfc/files/pysolfc-PIL-imports.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch new file mode 100644 index 000000000000..ed174d8aefe7 --- /dev/null +++ b/games-board/pysolfc/files/pysolfc-PIL-imports.patch @@ -0,0 +1,49 @@ +https://sourceforge.net/p/pysolfc/patches/10/ +https://bugs.gentoo.org/show_bug.cgi?id=471514 + +Index: pysollib/mfxutil.py +=================================================================== +diff --git a/PySolFC/trunk/pysollib/mfxutil.py b/PySolFC/trunk/pysollib/mfxutil.py +--- a/PySolFC/trunk/pysollib/mfxutil.py (revision 279) ++++ b/PySolFC/trunk/pysollib/mfxutil.py (working copy) +@@ -41,18 +41,18 @@ + Image = ImageTk = ImageOps = None + if TOOLKIT == 'tk': + try: # PIL +- import Image +- import ImageTk +- import ImageOps ++ from PIL import Image ++ from PIL import ImageTk ++ from PIL import ImageOps + except ImportError: + Image = None + else: + # for py2exe +- import GifImagePlugin +- import PngImagePlugin +- import JpegImagePlugin +- import BmpImagePlugin +- import PpmImagePlugin ++ from PIL import GifImagePlugin ++ from PIL import PngImagePlugin ++ from PIL import JpegImagePlugin ++ from PIL import BmpImagePlugin ++ from PIL import PpmImagePlugin + Image._initialized = 2 + USE_PIL = False + if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7': +Index: scripts/cardset_viewer.py +=================================================================== +diff --git a/PySolFC/trunk/scripts/cardset_viewer.py b/PySolFC/trunk/scripts/cardset_viewer.py +--- a/PySolFC/trunk/scripts/cardset_viewer.py (revision 279) ++++ b/PySolFC/trunk/scripts/cardset_viewer.py (working copy) +@@ -7,7 +7,7 @@ + from math import sqrt, sin, cos, pi + from Tkinter import * + try: +- import Image, ImageTk ++ from PIL import Image, ImageTk + except ImportError: + Image = None + |