61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
|
--- Pillow-2.7.0/setup.py 2014-12-31 20:42:56.000000000 +0530
|
||
|
|
+++ Pillow-2.7.0/setup.py 2015-02-26 19:38:59.000000000 +0530
|
||
|
|
@@ -20,7 +20,6 @@
|
||
|
|
|
||
|
|
# monkey patch import hook. Even though flake8 says it's not used, it is.
|
||
|
|
# comment this out to disable multi threaded builds.
|
||
|
|
-import mp_compile
|
||
|
|
|
||
|
|
_IMAGING = (
|
||
|
|
"decode", "encode", "map", "display", "outline", "path")
|
||
|
|
@@ -83,7 +82,7 @@
|
||
|
|
return open(file, 'rb').read()
|
||
|
|
|
||
|
|
try:
|
||
|
|
- import _tkinter
|
||
|
|
+ _tkinter = None
|
||
|
|
except (ImportError, OSError):
|
||
|
|
# pypy emits an oserror
|
||
|
|
_tkinter = None
|
||
|
|
@@ -186,7 +185,7 @@
|
||
|
|
for d in os.environ[k].split(os.path.pathsep):
|
||
|
|
_add_directory(library_dirs, d)
|
||
|
|
|
||
|
|
- prefix = sysconfig.get_config_var("prefix")
|
||
|
|
+ prefix = False
|
||
|
|
if prefix:
|
||
|
|
_add_directory(library_dirs, os.path.join(prefix, "lib"))
|
||
|
|
_add_directory(include_dirs, os.path.join(prefix, "include"))
|
||
|
|
@@ -199,7 +198,9 @@
|
||
|
|
_add_directory(library_dirs, os.path.join(
|
||
|
|
"/usr/lib", "python%s" % sys.version[:3], "config"))
|
||
|
|
|
||
|
|
- elif sys.platform == "darwin":
|
||
|
|
+ elif True:
|
||
|
|
+ pass
|
||
|
|
+ if False:
|
||
|
|
# attempt to make sure we pick freetype2 over other versions
|
||
|
|
_add_directory(include_dirs, "/sw/include/freetype2")
|
||
|
|
_add_directory(include_dirs, "/sw/lib/freetype2/include")
|
||
|
|
@@ -346,11 +347,7 @@
|
||
|
|
_add_directory(include_dirs, tcl_dir)
|
||
|
|
|
||
|
|
# standard locations
|
||
|
|
- _add_directory(library_dirs, "/usr/local/lib")
|
||
|
|
- _add_directory(include_dirs, "/usr/local/include")
|
||
|
|
|
||
|
|
- _add_directory(library_dirs, "/usr/lib")
|
||
|
|
- _add_directory(include_dirs, "/usr/include")
|
||
|
|
|
||
|
|
# on Windows, look for the OpenJPEG libraries in the location that
|
||
|
|
# the official installer puts them
|
||
|
|
@@ -575,7 +572,7 @@
|
||
|
|
exts.append(Extension(
|
||
|
|
"PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
|
||
|
|
|
||
|
|
- if sys.platform == "darwin":
|
||
|
|
+ if False:
|
||
|
|
# locate Tcl/Tk frameworks
|
||
|
|
frameworks = []
|
||
|
|
framework_roots = [
|