summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Rameau2009-09-01 14:59:24 +0200
committerQuentin Rameau2009-09-01 14:59:24 +0200
commitfbd02425d6803dad30778ea24ba2380d112f0c29 (patch)
tree3fcf1b5530ac091891a67bc5f1e39c7cf1508cdf
parentbb0b308b38e960738db6aeeebfa159dae9745e71 (diff)
python-pypi/pil: modified setup to search for zlib in /lib
-rw-r--r--python-pypi/pil/HISTORY5
-rw-r--r--python-pypi/pil/Imaging-1.1.6_libpath.patch11
-rwxr-xr-xpython-pypi/pil/PRE_BUILD6
3 files changed, 22 insertions, 0 deletions
diff --git a/python-pypi/pil/HISTORY b/python-pypi/pil/HISTORY
index 23d192a195..1cb8d7ed58 100644
--- a/python-pypi/pil/HISTORY
+++ b/python-pypi/pil/HISTORY
@@ -1,3 +1,7 @@
+2009-09-01 Quentin Rameau <quinq@sourcemage.org>
+ * PRE_BUILD, Imaging-1.1.6_libpath.patch: added, search for zlib in /lib,
+ moved (and removed) stuff done in BUILD to PRE_BUILD
+
2009-08-27 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: fix url
@@ -92,3 +96,4 @@
2002-06-12 Unet <unet@sourcemage.org>
* HISTORY: Created this.
+
diff --git a/python-pypi/pil/Imaging-1.1.6_libpath.patch b/python-pypi/pil/Imaging-1.1.6_libpath.patch
new file mode 100644
index 0000000000..99f9fc3df4
--- /dev/null
+++ b/python-pypi/pil/Imaging-1.1.6_libpath.patch
@@ -0,0 +1,11 @@
+Les sous-répertoires Imaging-1.1.6.orig/Docs et Imaging-1.1.6/Docs sont identiques.
+Les sous-répertoires Imaging-1.1.6.orig/Images et Imaging-1.1.6/Images sont identiques.
+Les sous-répertoires Imaging-1.1.6.orig/libImaging et Imaging-1.1.6/libImaging sont identiques.
+Les sous-répertoires Imaging-1.1.6.orig/PIL et Imaging-1.1.6/PIL sont identiques.
+Les sous-répertoires Imaging-1.1.6.orig/Sane et Imaging-1.1.6/Sane sont identiques.
+Les sous-répertoires Imaging-1.1.6.orig/Scripts et Imaging-1.1.6/Scripts sont identiques.
+diff Imaging-1.1.6.orig/setup.py Imaging-1.1.6/setup.py
+201a202,203
+> add_directory(library_dirs, "/lib")
+>
+Les sous-répertoires Imaging-1.1.6.orig/Tk et Imaging-1.1.6/Tk sont identiques.
diff --git a/python-pypi/pil/PRE_BUILD b/python-pypi/pil/PRE_BUILD
new file mode 100755
index 0000000000..b9644f01ed
--- /dev/null
+++ b/python-pypi/pil/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 <$SPELL_DIRECTORY/font.diff &&
+# adds /lib to lib search path, in order to find zlib
+patch -p1 < ${SPELL_DIRECTORY}/Imaging-1.1.6_libpath.patch &&
+python setup.py build_ext -i