sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Quentin Rameau (1f56596ffc7ab988d33048ad9ba37e62bb474cc8)

From: Quentin Rameau <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Quentin Rameau (1f56596ffc7ab988d33048ad9ba37e62bb474cc8)
Date: Tue, 1 Sep 2009 08:48:57 -0500

GIT changes to master grimoire by Quentin Rameau <quinq AT sourcemage.org>:

python-pypi/pil/BUILD | 9 ---------
python-pypi/pil/INSTALL | 11 ++++++-----
python-pypi/pil/Imaging-1.1.6_libpath.patch | 23 ++++++++++++-----------
python-pypi/pil/PRE_BUILD | 3 +--
4 files changed, 19 insertions(+), 27 deletions(-)

New commits:
commit 1f56596ffc7ab988d33048ad9ba37e62bb474cc8
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

python-pypi/pil: forgot to remove some test stuff, now clean

diff --git a/python-pypi/pil/BUILD b/python-pypi/pil/BUILD
index 2682c92..806c384 100755
--- a/python-pypi/pil/BUILD
+++ b/python-pypi/pil/BUILD
@@ -1,10 +1 @@
-patch -p0 <$SPELL_DIRECTORY/font.diff &&
-#cd libImaging &&
-# Ignores $OPTS &&
-#./configure &&
-#make &&
-#cd .. &&
-# a fix for some variable scoping problem in thier setup.py
-#mv setup.py set1.py &&
-sed -i '/HAVE_TCLTK = 0/aEXTRA_COMPILE_ARGS = NoneEXTRA_LINK_ARGS = None'
setup.py &&
python setup.py build_ext -i
diff --git a/python-pypi/pil/INSTALL b/python-pypi/pil/INSTALL
index ad2f8d0..940899c 100755
--- a/python-pypi/pil/INSTALL
+++ b/python-pypi/pil/INSTALL
@@ -1,5 +1,6 @@
-cd libImaging &&
-cp *.h \
- $INSTALL_ROOT/usr/include/python$(installed_version python|cut -d . -f
1,2) &&
-cd .. &&
-default_install
+#cd libImaging &&
+#cp *.h \
+# $INSTALL_ROOT/usr/include/python$(installed_version python|cut -d . -f
1,2) &&
+#cd .. &&
+#default_install
+default_install_python
diff --git a/python-pypi/pil/Imaging-1.1.6_libpath.patch
b/python-pypi/pil/Imaging-1.1.6_libpath.patch
index 99f9fc3..9928d6a 100644
--- a/python-pypi/pil/Imaging-1.1.6_libpath.patch
+++ b/python-pypi/pil/Imaging-1.1.6_libpath.patch
@@ -1,11 +1,12 @@
-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 -Naur Imaging-1.1.6.orig/setup.py Imaging-1.1.6/setup.py
+--- Imaging-1.1.6.orig/setup.py 2006-12-03 12:37:29.000000000 +0100
++++ Imaging-1.1.6/setup.py 2009-09-01 15:10:50.159536841 +0200
+@@ -199,6 +199,8 @@
+ add_directory(library_dirs, "/usr/lib")
+ add_directory(include_dirs, "/usr/include")
+
++ add_directory(library_dirs, "/lib")
++
+ #
+ # insert new dirs *before* default libs, to avoid conflicts
+ # between Python PYD stub libs and real libraries
diff --git a/python-pypi/pil/PRE_BUILD b/python-pypi/pil/PRE_BUILD
index b9644f0..6d50178 100755
--- a/python-pypi/pil/PRE_BUILD
+++ b/python-pypi/pil/PRE_BUILD
@@ -2,5 +2,4 @@ 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
+patch -p1 < ${SPELL_DIRECTORY}/Imaging-1.1.6_libpath.patch

[SM-Commit] GIT changes to master grimoire by Quentin Rameau (1f56596ffc7ab988d33048ad9ba37e62bb474cc8), Quentin Rameau, 09/01/2009