diff options
| author | snj <snj> | 2009-09-12 19:45:29 +0000 |
|---|---|---|
| committer | snj <snj> | 2009-09-12 19:45:29 +0000 |
| commit | 7a73f1af189b3ced81639b5be75fb5bdb0ce15ce (patch) | |
| tree | 1186d092fb2ab1b82d59e78fe9d893a75e4fa340 /games/pysolfc/patches | |
| parent | dee8033b8d012c9d1d484acc9e527910c5cd8d81 (diff) | |
| download | pkgsrc-7a73f1af189b3ced81639b5be75fb5bdb0ce15ce.tar.gz | |
Remove dependency on py-imagingtk. pysolfc works fine without it. The
problem wiz stumbled upon only occurs if py-imaging is installed and
py-imagingtk is not. pysolfc assumed that if py-imaging was installed,
py-imagingtk was also installed. patch-ac corrects this by simply
disabling the runtime detection of these optional dependencies.
The real issue, it seems to me, is that py-imaging installs ImageTk.py,
which needs py-imagingtk to be useful. This is why pysolfc got
confused. pkgsrc should probably be changed to install ImageTk.py in
the py-imagingtk package instead, but I'd rather not audit all
py-imaging users right now, so I'll leave that for someone else.
Bump PKGREVISION to 4.
Diffstat (limited to 'games/pysolfc/patches')
| -rw-r--r-- | games/pysolfc/patches/patch-ac | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/games/pysolfc/patches/patch-ac b/games/pysolfc/patches/patch-ac new file mode 100644 index 00000000000..413279c4730 --- /dev/null +++ b/games/pysolfc/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.1 2009/09/12 19:45:29 snj Exp $ + +--- pysollib/mfxutil.py.orig 2009-09-12 12:22:02.000000000 -0700 ++++ pysollib/mfxutil.py 2009-09-12 12:22:14.000000000 -0700 +@@ -51,21 +51,6 @@ except: + from settings import PACKAGE, TOOLKIT + + Image = ImageTk = ImageOps = None +-if TOOLKIT == 'tk': +- try: # PIL +- import Image +- except ImportError: +- pass +- else: +- import ImageTk +- import ImageOps +- # for py2exe +- import GifImagePlugin +- import PngImagePlugin +- import JpegImagePlugin +- import BmpImagePlugin +- import PpmImagePlugin +- Image._initialized = 2 + + + # /*********************************************************************** |