summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-09-16 17:43:38 +0200
committerDavid Seifert <soap@gentoo.org>2016-09-18 15:27:57 +0200
commit8457b747b7dedad5aaa956a0a802af39750c0f78 (patch)
tree72ff09639c7cebdc57af1dac9678708b5594e5a8 /dev-python/pillow
parentdev-python/mockldap: remove unused patch (diff)
downloadgentoo-8457b747b7dedad5aaa956a0a802af39750c0f78.tar.gz
gentoo-8457b747b7dedad5aaa956a0a802af39750c0f78.tar.bz2
gentoo-8457b747b7dedad5aaa956a0a802af39750c0f78.zip
dev-python/pillow: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2343 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-python/pillow')
-rw-r--r--dev-python/pillow/files/imaging-1.1.7-no-xv.patch18
-rw-r--r--dev-python/pillow/files/pillow-2.0.0-delete_hardcoded_paths.patch178
-rw-r--r--dev-python/pillow/files/pillow-2.0.0-libm_linking.patch20
-rw-r--r--dev-python/pillow/files/pillow-freetype-2.5.1.patch28
4 files changed, 0 insertions, 244 deletions
diff --git a/dev-python/pillow/files/imaging-1.1.7-no-xv.patch b/dev-python/pillow/files/imaging-1.1.7-no-xv.patch
deleted file mode 100644
index 1cbaf515bd4a..000000000000
--- a/dev-python/pillow/files/imaging-1.1.7-no-xv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- PIL/ImageShow.py.old 2009-11-30 10:28:37.000000000 +0100
-+++ PIL/ImageShow.py 2009-11-30 10:29:02.000000000 +0100
-@@ -149,13 +149,10 @@
- def get_command_ex(self, file, title=None, **options):
- # note: xv is pretty outdated. most modern systems have
- # imagemagick's display command instead.
-- command = executable = "xv"
-- if title:
-- # FIXME: do full escaping
-- command = command + " -name \"%s\"" % title
-+ command = executable = "xdg-open"
- return command, executable
-
-- if which("xv"):
-+ if which("xdg-open"):
- register(XVViewer)
-
- if __name__ == "__main__":
diff --git a/dev-python/pillow/files/pillow-2.0.0-delete_hardcoded_paths.patch b/dev-python/pillow/files/pillow-2.0.0-delete_hardcoded_paths.patch
deleted file mode 100644
index ed5bdca65cb3..000000000000
--- a/dev-python/pillow/files/pillow-2.0.0-delete_hardcoded_paths.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -56,11 +56,6 @@
- return None
-
-
--def _lib_include(root):
-- # map root to (root/lib, root/include)
-- return os.path.join(root, "lib"), os.path.join(root, "include")
--
--
- def _read(file):
- return open(file, 'rb').read()
-
-@@ -105,102 +100,17 @@
- _add_directory(include_dirs, include_root)
-
- #
-- # add platform directories
--
-- if sys.platform == "cygwin":
-- # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory
-- _add_directory(library_dirs, os.path.join(
-- "/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")
--
-- elif sys.platform.startswith("linux"):
-- for platform_ in (platform.processor(),platform.architecture()[0]):
-- if not platform_: continue
--
-- if platform_ in ["x86_64", "64bit"]:
-- _add_directory(library_dirs, "/lib64")
-- _add_directory(library_dirs, "/usr/lib64")
-- _add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu")
-- break
-- elif platform_ in ["i386", "i686", "32bit"]:
-- _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
-- break
-- else:
-- raise ValueError("Unable to identify Linux platform: `%s`" % platform_)
--
-- # XXX Kludge. Above /\ we brute force support multiarch. Here we
-- # try Barry's more general approach. Afterward, something should
-- # 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"))
-- _add_directory(include_dirs, os.path.join(prefix, "include"))
--
-- #
- # locate tkinter libraries
-
-
- if _tkinter:
- TCL_VERSION = _tkinter.TCL_VERSION[:3]
-
-- if _tkinter and not TCL_ROOT:
-- # we have Tkinter but the TCL_ROOT variable was not set;
-- # try to locate appropriate Tcl/Tk libraries
-- PYVERSION = sys.version[0] + sys.version[2]
-- TCLVERSION = TCL_VERSION[0] + TCL_VERSION[2]
-- roots = [
-- # common installation directories, mostly for Windows
-- # (for Unix-style platforms, we'll check in well-known
-- # locations later)
-- os.path.join("/py" + PYVERSION, "Tcl"),
-- os.path.join("/python" + PYVERSION, "Tcl"),
-- "/Tcl", "/Tcl" + TCLVERSION, "/Tcl" + TCL_VERSION,
-- os.path.join(os.environ.get("ProgramFiles", ""), "Tcl"),
-- ]
-- for TCL_ROOT in roots:
-- TCL_ROOT = os.path.abspath(TCL_ROOT)
-- if os.path.isfile(os.path.join(TCL_ROOT, "include", "tk.h")):
-- # FIXME: use distutils logging (?)
-- print("--- using Tcl/Tk libraries at", TCL_ROOT)
-- print("--- using Tcl/Tk version", TCL_VERSION)
-- TCL_ROOT = _lib_include(TCL_ROOT)
-- break
-- else:
-- TCL_ROOT = None
--
-
- #
- # 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")
-
- #
-@@ -333,28 +243,7 @@
- "_webp", ["_webp.c"], libraries=["webp"]))
-
-
-- 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]))
-@@ -445,30 +334,6 @@
- if m.group(1) < "1.2.3":
- return m.group(1)
-
-- # http://hg.python.org/users/barry/rev/7e8deab93d5a
-- def add_multiarch_paths(self):
-- # Debian/Ubuntu multiarch support.
-- # https://wiki.ubuntu.com/MultiarchSpec
-- # self.build_temp
-- tmpfile = os.path.join(self.build_temp, 'multiarch')
-- if not os.path.exists(self.build_temp):
-- os.makedirs(self.build_temp)
-- ret = os.system('dpkg-architecture -qDEB_HOST_MULTIARCH > %s' %
-- tmpfile)
-- ret = os.system(
-- 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-- tmpfile)
-- try:
-- if ret >> 8 == 0:
-- fp = open(tmpfile, 'r')
-- multiarch_path_component = fp.readline().strip()
-- _add_directory(self.compiler.library_dirs,
-- '/usr/lib/' + multiarch_path_component)
-- _add_directory(self.compiler.include_dirs,
-- '/usr/include/' + multiarch_path_component)
-- finally:
-- os.unlink(tmpfile)
--
- setup(
- name=NAME,
- version=VERSION,
diff --git a/dev-python/pillow/files/pillow-2.0.0-libm_linking.patch b/dev-python/pillow/files/pillow-2.0.0-libm_linking.patch
deleted file mode 100644
index 35d1df5a406b..000000000000
--- a/dev-python/pillow/files/pillow-2.0.0-libm_linking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -197,7 +197,7 @@
- for file in _LIB_IMAGING:
- files.append(os.path.join("libImaging", file + ".c"))
-
-- libs = []
-+ libs = ["m"]
- defs = []
- if feature.jpeg:
- libs.append(feature.jpeg)
-@@ -249,7 +249,7 @@
- libraries=[feature.tcl, feature.tk]))
-
- if os.path.isfile("_imagingmath.c"):
-- exts.append(Extension("_imagingmath", ["_imagingmath.c"]))
-+ exts.append(Extension("_imagingmath", ["_imagingmath.c"], libraries=["m"]))
-
- self.extensions[:] = exts
-
diff --git a/dev-python/pillow/files/pillow-freetype-2.5.1.patch b/dev-python/pillow/files/pillow-freetype-2.5.1.patch
deleted file mode 100644
index 5e949e4f241a..000000000000
--- a/dev-python/pillow/files/pillow-freetype-2.5.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c6040f618d8f2706a7b46d1cdf37d1a587f9701f Mon Sep 17 00:00:00 2001
-From: Andrew Stromnov <stromnov@gmail.com>
-Date: Thu, 28 Nov 2013 16:58:43 +0400
-Subject: [PATCH] fix compiling with FreeType 2.5.1
-
----
- _imagingft.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/_imagingft.c b/_imagingft.c
-index 47d50bd..f19555b 100644
---- a/_imagingft.c
-+++ b/_imagingft.c
-@@ -59,7 +59,11 @@ struct {
- const char* message;
- } ft_errors[] =
-
-+#if defined(USE_FREETYPE_2_1)
-+#include FT_ERRORS_H
-+#else
- #include <freetype/fterrors.h>
-+#endif
-
- /* -------------------------------------------------------------------- */
- /* font objects */
---
-1.8.5.1
-