← Back to branch summary

~inkscape.dev/inkscape/rotatecopies_improvements

« back to all changes in this revision

Viewing changes to packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff

  • Committer: Martin Owens
  • Date: 2017-01-01 01:34:43 UTC
  • mfrom: (15377.1.1 inkscape)
  • Revision ID: doctormo@gmail.com-20170101013443-d57u4xyxwuu41ixk
Merge in package removal branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff
1
 
--- setup.py.orig       2014-09-02 02:51:22.000000000 +0200
2
 
+++ setup.py    2014-09-02 02:53:51.000000000 +0200
3
 
@@ -100,18 +100,9 @@
4
 
                 "/usr/lib", "python%s" % sys.version[:3], "config"))
5
 
 
6
 
         elif sys.platform == "darwin":
7
 
-            # attempt to make sure we pick freetype2 over other versions
8
 
-            _add_directory(include_dirs, "/sw/include/freetype2")
9
 
-            _add_directory(include_dirs, "/sw/lib/freetype2/include")
10
 
-            # fink installation directories
11
 
-            _add_directory(library_dirs, "/sw/lib")
12
 
-            _add_directory(include_dirs, "/sw/include")
13
 
             # darwin ports installation directories
14
 
-            _add_directory(library_dirs, "/opt/local/lib")
15
 
-            _add_directory(include_dirs, "/opt/local/include")
16
 
-            # freetype2 ships with X11
17
 
-            _add_directory(library_dirs, "/usr/X11/lib")
18
 
-            _add_directory(include_dirs, "/usr/X11/include")
19
 
+            _add_directory(library_dirs, "@prefix@/lib")
20
 
+            _add_directory(include_dirs, "@prefix@/include")
21
 
 
22
 
         elif sys.platform.startswith("linux"):
23
 
             if platform.processor() == "x86_64":
24
 
@@ -126,9 +117,6 @@
25
 
             # work ;-)
26
 
             self.add_multiarch_paths()
27
 
 
28
 
-        _add_directory(library_dirs, "/usr/local/lib")
29
 
-        # FIXME: check /opt/stuff directories here?
30
 
-
31
 
         prefix = sysconfig.get_config_var("prefix")
32
 
         if prefix:
33
 
             _add_directory(library_dirs, os.path.join(prefix, "lib"))
34
 
@@ -180,19 +168,6 @@
35
 
         #
36
 
         # add standard directories
37
 
 
38
 
-        # look for tcl specific subdirectory (e.g debian)
39
 
-        if _tkinter:
40
 
-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
41
 
-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
42
 
-                _add_directory(include_dirs, tcl_dir)
43
 
-
44
 
-        # standard locations
45
 
-        _add_directory(library_dirs, "/usr/local/lib")
46
 
-        _add_directory(include_dirs, "/usr/local/include")
47
 
-
48
 
-        _add_directory(library_dirs, "/usr/lib")
49
 
-        _add_directory(include_dirs, "/usr/include")
50
 
-
51
 
         #
52
 
         # insert new dirs *before* default libs, to avoid conflicts
53
 
         # between Python PYD stub libs and real libraries
54
 
@@ -307,28 +282,7 @@
55
 
             exts.append(Extension(
56
 
                 "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra))
57
 
 
58
 
-        if sys.platform == "darwin":
59
 
-            # locate Tcl/Tk frameworks
60
 
-            frameworks = []
61
 
-            framework_roots = [
62
 
-                "/Library/Frameworks",
63
 
-                "/System/Library/Frameworks"]
64
 
-            for root in framework_roots:
65
 
-                if (os.path.exists(os.path.join(root, "Tcl.framework")) and
66
 
-                    os.path.exists(os.path.join(root, "Tk.framework"))):
67
 
-                    print("--- using frameworks at %s" % root)
68
 
-                    frameworks = ["-framework", "Tcl", "-framework", "Tk"]
69
 
-                    dir = os.path.join(root, "Tcl.framework", "Headers")
70
 
-                    _add_directory(self.compiler.include_dirs, dir, 0)
71
 
-                    dir = os.path.join(root, "Tk.framework", "Headers")
72
 
-                    _add_directory(self.compiler.include_dirs, dir, 1)
73
 
-                    break
74
 
-            if frameworks:
75
 
-                exts.append(Extension(
76
 
-                    "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
77
 
-                    extra_compile_args=frameworks, extra_link_args=frameworks))
78
 
-                feature.tcl = feature.tk = 1  # mark as present
79
 
-        elif feature.tcl and feature.tk:
80
 
+        if feature.tcl and feature.tk:
81
 
             exts.append(Extension(
82
 
                 "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
83
 
                 libraries=[feature.tcl, feature.tk]))