diff options
Diffstat (limited to 'packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff')
| -rw-r--r-- | packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff b/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff deleted file mode 100644 index 2f4b797f6..000000000 --- a/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- setup.py.orig 2014-09-02 02:51:22.000000000 +0200 -+++ setup.py 2014-09-02 02:53:51.000000000 +0200 -@@ -100,18 +100,9 @@ - "/usr/lib", "python%s" % sys.version[:3], "config")) - - elif sys.platform == "darwin": -- # 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") -- # fink installation directories -- _add_directory(library_dirs, "/sw/lib") -- _add_directory(include_dirs, "/sw/include") - # darwin ports installation directories -- _add_directory(library_dirs, "/opt/local/lib") -- _add_directory(include_dirs, "/opt/local/include") -- # freetype2 ships with X11 -- _add_directory(library_dirs, "/usr/X11/lib") -- _add_directory(include_dirs, "/usr/X11/include") -+ _add_directory(library_dirs, "@prefix@/lib") -+ _add_directory(include_dirs, "@prefix@/include") - - elif sys.platform.startswith("linux"): - if platform.processor() == "x86_64": -@@ -126,9 +117,6 @@ - # work ;-) - self.add_multiarch_paths() - -- _add_directory(library_dirs, "/usr/local/lib") -- # FIXME: check /opt/stuff directories here? -- - prefix = sysconfig.get_config_var("prefix") - if prefix: - _add_directory(library_dirs, os.path.join(prefix, "lib")) -@@ -180,19 +168,6 @@ - # - # add standard directories - -- # look for tcl specific subdirectory (e.g debian) -- if _tkinter: -- tcl_dir = "/usr/include/tcl" + TCL_VERSION -- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): -- _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") -- - # - # insert new dirs *before* default libs, to avoid conflicts - # between Python PYD stub libs and real libraries -@@ -307,28 +282,7 @@ - exts.append(Extension( - "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra)) - -- if sys.platform == "darwin": -- # locate Tcl/Tk frameworks -- frameworks = [] -- framework_roots = [ -- "/Library/Frameworks", -- "/System/Library/Frameworks"] -- for root in framework_roots: -- if (os.path.exists(os.path.join(root, "Tcl.framework")) and -- os.path.exists(os.path.join(root, "Tk.framework"))): -- print("--- using frameworks at %s" % root) -- frameworks = ["-framework", "Tcl", "-framework", "Tk"] -- dir = os.path.join(root, "Tcl.framework", "Headers") -- _add_directory(self.compiler.include_dirs, dir, 0) -- dir = os.path.join(root, "Tk.framework", "Headers") -- _add_directory(self.compiler.include_dirs, dir, 1) -- break -- if frameworks: -- exts.append(Extension( -- "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], -- extra_compile_args=frameworks, extra_link_args=frameworks)) -- feature.tcl = feature.tk = 1 # mark as present -- elif feature.tcl and feature.tk: -+ if feature.tcl and feature.tk: - exts.append(Extension( - "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], - libraries=[feature.tcl, feature.tk])) |