py25-Pillow/files/patch-setup.py-v1.7.8.diff

d77a920e949c865a25cba18261a54fa1ec6c87c8~suv--- setup.py.orig   2014-09-02 02:51:22.000000000 +0200
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv+++ setup.py    2014-09-02 02:53:51.000000000 +0200
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv@@ -100,18 +100,9 @@
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv                 "/usr/lib", "python%s" % sys.version[:3], "config"))
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         elif sys.platform == "darwin":
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            # attempt to make sure we pick freetype2 over other versions
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(include_dirs, "/sw/include/freetype2")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(include_dirs, "/sw/lib/freetype2/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            # fink installation directories
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(library_dirs, "/sw/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(include_dirs, "/sw/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             # darwin ports installation directories
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(library_dirs, "/opt/local/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(include_dirs, "/opt/local/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            # freetype2 ships with X11
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(library_dirs, "/usr/X11/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            _add_directory(include_dirs, "/usr/X11/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv+            _add_directory(library_dirs, "@prefix@/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv+            _add_directory(include_dirs, "@prefix@/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         elif sys.platform.startswith("linux"):
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             if platform.processor() == "x86_64":
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv@@ -126,9 +117,6 @@
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             # work ;-)
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             self.add_multiarch_paths()
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        _add_directory(library_dirs, "/usr/local/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        # FIXME: check /opt/stuff directories here?
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         prefix = sysconfig.get_config_var("prefix")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         if prefix:
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             _add_directory(library_dirs, os.path.join(prefix, "lib"))
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv@@ -180,19 +168,6 @@
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         #
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         # add standard directories
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        # look for tcl specific subdirectory (e.g debian)
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        if _tkinter:
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                _add_directory(include_dirs, tcl_dir)
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        # standard locations
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        _add_directory(library_dirs, "/usr/local/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        _add_directory(include_dirs, "/usr/local/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        _add_directory(library_dirs, "/usr/lib")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        _add_directory(include_dirs, "/usr/include")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         #
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         # insert new dirs *before* default libs, to avoid conflicts
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv         # between Python PYD stub libs and real libraries
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv@@ -307,28 +282,7 @@
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             exts.append(Extension(
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv                 "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra))
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        if sys.platform == "darwin":
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            # locate Tcl/Tk frameworks
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            frameworks = []
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            framework_roots = [
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                "/Library/Frameworks",
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                "/System/Library/Frameworks"]
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            for root in framework_roots:
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                if (os.path.exists(os.path.join(root, "Tcl.framework")) and
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    os.path.exists(os.path.join(root, "Tk.framework"))):
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    print("--- using frameworks at %s" % root)
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    frameworks = ["-framework", "Tcl", "-framework", "Tk"]
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    dir = os.path.join(root, "Tcl.framework", "Headers")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    _add_directory(self.compiler.include_dirs, dir, 0)
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    dir = os.path.join(root, "Tk.framework", "Headers")
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    _add_directory(self.compiler.include_dirs, dir, 1)
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    break
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-            if frameworks:
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                exts.append(Extension(
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                    extra_compile_args=frameworks, extra_link_args=frameworks))
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-                feature.tcl = feature.tk = 1  # mark as present
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv-        elif feature.tcl and feature.tk:
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv+        if feature.tcl and feature.tk:
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv             exts.append(Extension(
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv                 "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
d77a920e949c865a25cba18261a54fa1ec6c87c8~suv                 libraries=[feature.tcl, feature.tk]))