diff options
Diffstat (limited to 'dev-python/imaging/files')
8 files changed, 137 insertions, 0 deletions
diff --git a/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch b/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch new file mode 100644 index 000000000000..7733a489038b --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-dont-run-multiple-viewers.patch @@ -0,0 +1,10 @@ +--- PIL/ImageShow.py.old 2011-01-29 14:09:12.000000000 -0200 ++++ PIL/ImageShow.py 2011-01-29 14:09:28.000000000 -0200 +@@ -63,7 +63,7 @@ + if base != image.mode and image.mode != "1": + image = image.convert(base) + +- self.show_image(image, **options) ++ return self.show_image(image, **options) + + # hook methods diff --git a/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch new file mode 100644 index 000000000000..cdc068390387 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/508748 + +fix building w/freetype-2.5.3 + +patch by Jungshik Shin <jshin@chromium.org> + +--- Imaging-1.1.7/_imagingft.c ++++ Imaging-1.1.7/_imagingft.c +@@ -70,7 +70,11 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++#include FT_ERRORS_H ++#else + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/dev-python/imaging/files/imaging-1.1.7-giftrans.patch b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch new file mode 100644 index 000000000000..1a109d28eee0 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch @@ -0,0 +1,14 @@ +--- Imaging-1.1.6.orig/PIL/GifImagePlugin.py 2006-12-03 11:37:15.000000000 +0000 ++++ Imaging-1.1.6/PIL/GifImagePlugin.py 2008-10-02 14:51:43.000000000 +0100 +@@ -352,6 +352,11 @@ + for i in range(maxcolor): + s.append(chr(i) * 3) + ++ if im.info.has_key('transparency'): ++ transparentIndex = im.info['transparency'] ++ s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) + ++ chr(transparentIndex) + chr(0)) ++ + return s + + def getdata(im, offset = (0, 0), **params): diff --git a/dev-python/imaging/files/imaging-1.1.7-missing-math.patch b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch new file mode 100644 index 000000000000..f4d6167eeccc --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch @@ -0,0 +1,20 @@ +--- setup.py.old 2009-07-03 11:34:59.141671252 +0200 ++++ setup.py 2009-07-03 11:51:54.415666711 +0200 +@@ -281,6 +281,8 @@ class pil_build_ext(build_ext): + if struct.unpack("h", "\0\1")[0] == 1: + defs.append(("WORDS_BIGENDIAN", None)) + ++ libs.append("m") ++ + exts = [(Extension( + "_imaging", files, libraries=libs, define_macros=defs + ))] +@@ -332,7 +334,7 @@ class pil_build_ext(build_ext): + )) + + 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/imaging/files/imaging-1.1.7-no-host-paths.patch b/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch new file mode 100644 index 000000000000..a84c032450cf --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch @@ -0,0 +1,29 @@ +do not poke around /usr/include and /usr/lib directly as it's (1) not needed +and (2) breaks cross-compiling + +patch from Chromium OS + +--- a/setup.py ++++ b/setup.py +@@ -147,7 +147,6 @@ class pil_build_ext(build_ext): + add_directory(library_dirs, "/opt/local/lib") + add_directory(include_dirs, "/opt/local/include") + +- add_directory(library_dirs, "/usr/local/lib") + # FIXME: check /opt/stuff directories here? + + prefix = sysconfig.get_config_var("prefix") +@@ -207,13 +206,6 @@ class pil_build_ext(build_ext): + 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 diff --git a/dev-python/imaging/files/imaging-1.1.7-no-xv.patch b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch new file mode 100644 index 000000000000..1cbaf515bd4a --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch @@ -0,0 +1,18 @@ +--- 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/imaging/files/imaging-1.1.7-nolcms.patch b/dev-python/imaging/files/imaging-1.1.7-nolcms.patch new file mode 100644 index 000000000000..e087cd301dd5 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-nolcms.patch @@ -0,0 +1,13 @@ +--- setup.py.orig ++++ setup.py 2011-09-04 +@@ -264,10 +264,6 @@ + if dir: + add_directory(self.compiler.include_dirs, dir, 0) + +- if find_include_file(self, "lcms.h"): +- if find_library_file(self, "lcms"): +- feature.lcms = "lcms" +- + if _tkinter and find_include_file(self, "tk.h"): + # the library names may vary somewhat (e.g. tcl84 or tcl8.4) + version = TCL_VERSION[0] + TCL_VERSION[2] diff --git a/dev-python/imaging/files/imaging-1.1.7-sane.patch b/dev-python/imaging/files/imaging-1.1.7-sane.patch new file mode 100644 index 000000000000..4970e50033a4 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-sane.patch @@ -0,0 +1,13 @@ +--- Imaging-1.1.6/Sane/_sane.c.orig 2006-12-03 13:12:22.000000000 +0100 ++++ Imaging-1.1.6/Sane/_sane.c 2009-02-28 11:41:19.000000000 +0200 +@@ -1152,8 +1152,8 @@ + static PyObject * + PySane_get_devices(PyObject *self, PyObject *args) + { +- SANE_Device **devlist; +- SANE_Device *dev; ++ const SANE_Device **devlist; ++ const SANE_Device *dev; + SANE_Status st; + PyObject *list; + int local_only, i; |