From 97108986150563b481b04543b4c51a26f59d227c Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 7 Jul 2010 03:55:53 -0700 Subject: python-imaging: upgrade from 1.1.6 to 1.1.7 Rebased the path.patch to the newer code Signed-off-by: Nitin A Kamble --- meta/packages/python/python-imaging/path.patch | 32 +++++++++++--------------- 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'meta/packages/python/python-imaging') diff --git a/meta/packages/python/python-imaging/path.patch b/meta/packages/python/python-imaging/path.patch index 1dc467a56d..264dcc09b8 100644 --- a/meta/packages/python/python-imaging/path.patch +++ b/meta/packages/python/python-imaging/path.patch @@ -1,30 +1,26 @@ -Index: Imaging-1.1.5/setup.py +Index: Imaging-1.1.7/setup.py =================================================================== ---- Imaging-1.1.5.orig/setup.py 2005-03-23 19:16:40.000000000 +0100 -+++ Imaging-1.1.5/setup.py 2006-05-31 14:36:07.000000000 +0200 -@@ -28,12 +28,13 @@ - # +--- Imaging-1.1.7.orig/setup.py ++++ Imaging-1.1.7/setup.py +@@ -34,10 +34,10 @@ def libinclude(root): # TIFF_ROOT = libinclude("/opt/tiff") --FREETYPE_ROOT = None + TCL_ROOT = None -JPEG_ROOT = None -+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] -+JPEG_ROOT = os.environ['STAGING_LIBDIR'] - TIFF_ROOT = None -ZLIB_ROOT = None ++JPEG_ROOT = os.environ['STAGING_LIBDIR'] +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] - TCL_ROOT = None + TIFF_ROOT = None +-FREETYPE_ROOT = None ++FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] + LCMS_ROOT = None -+ # FIXME: add mechanism to explicitly *disable* the use of a library +@@ -207,14 +207,6 @@ class pil_build_ext(build_ext): + if os.path.isfile(os.path.join(tcl_dir, "tk.h")): + add_directory(include_dirs, tcl_dir) - # -------------------------------------------------------------------- -@@ -175,15 +176,6 @@ - add_directory(include_dirs, include_root) - - # -- # add standard directories -- +- # standard locations - add_directory(library_dirs, "/usr/local/lib") - add_directory(include_dirs, "/usr/local/include") - -- cgit v1.2.3