Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26115
Modified Files:
pil-py.info pil-py.patch
Log Message:
dep cleanup; add py26 variant
Index: pil-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/pil-py.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pil-py.info 8 Nov 2008 14:24:42 -0000 1.16
+++ pil-py.info 20 Nov 2008 16:55:06 -0000 1.17
@@ -1,11 +1,11 @@
Info2: <<
Package: pil-py%type_pkg[python]
-Type: python (2.3 2.4 2.5)
+Type: python (2.3 2.4 2.5 2.6)
Version: 1.1.6
-Revision: 5
-Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
+Revision: 6
+Distribution: (%type_pkg[python] = 23) 10.4
Description: Python Imaging Library
DescDetail: <<
The Python Imaging Library (PIL) adds image processing capabilities to
@@ -14,22 +14,28 @@
<<
Source: http://effbot.org/downloads/Imaging-%v.tar.gz
Source-MD5: 3a9b5c20ca52f0a9900512d2c7347622
-BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg, freetype219, fink (>=
0.24.12-1)
-Depends: python%type_pkg[python], tcltk (>= 8.4.1-1), libpng3-shlibs,
libjpeg-shlibs, freetype219-shlibs
-NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ freetype219 (>= 2.3.7-7),
+ libjpeg,
+ tcltk-dev (>= 8.4.1-1)
+<<
+Depends: <<
+ freetype219-shlibs (>= 2.3.7-7),
+ libjpeg-shlibs,
+ python%type_pkg[python],
+ tcltk (>= 8.4.1-1)
+<<
Replaces: pil
Provides: pil
-GCC: 4.0
PatchFile: %{ni}.patch
-PatchFile-MD5: 9100d435697b962048e9a3c239552c2c
+PatchFile-MD5: 09d07243029c29ab23e3fd97d1ac3ae4
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
%p/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
#!/bin/sh -ev
- FREETYPE_ROOT=%p/lib/freetype219
%p/bin/python%type_raw[python] setup.py install --root=%d
mkdir -p %i/share/doc/%n
cp -R Docs/ %i/share/doc/%n/html
@@ -43,10 +49,15 @@
mv pilprint.py pilprint%type_raw[python].py
mv pilfile.py pilfile%type_raw[python].py
<<
-DocFiles: CHANGES BUILDME CONTENTS README
+DocFiles: CHANGES README
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: None <[EMAIL PROTECTED]>
+DescPackaging: <<
+ Uses the tcl that matches python's tkinter
+
+ Avoid un-needed -I and -L paths
+<<
# Info2
<<
Index: pil-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/pil-py.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pil-py.patch 12 Aug 2008 19:02:38 -0000 1.5
+++ pil-py.patch 20 Nov 2008 16:55:06 -0000 1.6
@@ -1,23 +1,13 @@
diff -Nurd -x'*~' Imaging-1.1.6.orig/setup.py Imaging-1.1.6/setup.py
--- Imaging-1.1.6.orig/setup.py 2006-12-03 06:37:29.000000000 -0500
-+++ Imaging-1.1.6/setup.py 2008-08-12 15:01:14.000000000 -0400
-@@ -34,7 +34,7 @@
- #
- # TIFF_ROOT = libinclude("/opt/tiff")
-
--FREETYPE_ROOT = None
-+FREETYPE_ROOT = libinclude("@PREFIX@/lib/freetype219")
- JPEG_ROOT = None
- TIFF_ROOT = None
- ZLIB_ROOT = None
-@@ -131,22 +131,14 @@
++++ Imaging-1.1.6/setup.py 2008-11-20 11:28:06.000000000 -0500
+@@ -130,17 +130,10 @@
+ ))
elif sys.platform == "darwin":
- # attempt to make sure we pick freetype2 over other versions
+- # 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")
-+ add_directory(include_dirs, "@PREFIX@/lib/freetype219/lib")
-+ add_directory(include_dirs,
"@PREFIX@/lib/freetype219/include/freetype2/freetype")
# fink installation directories
- add_directory(library_dirs, "/sw/lib")
- add_directory(include_dirs, "/sw/include")
@@ -30,27 +20,27 @@
- 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
-@@ -193,8 +185,10 @@
+ prefix = sysconfig.get_config_var("prefix")
+@@ -193,8 +186,6 @@
#
# add standard directories
- add_directory(library_dirs, "/usr/local/lib")
- add_directory(include_dirs, "/usr/local/include")
-+ 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"))
add_directory(library_dirs, "/usr/lib")
add_directory(include_dirs, "/usr/include")
-@@ -302,30 +296,7 @@
+@@ -245,7 +236,8 @@
+ feature.freetype = "freetype"
+ feature.freetype_version = freetype_version
+ if dir:
+- add_directory(self.compiler.include_dirs, dir, 0)
++ # ft also needs its subdir; place after the one local -I
flag
++ add_directory(self.compiler.include_dirs, dir, 1)
+
+ if _tkinter:
+ # the library names may vary somewhat (e.g. tcl84 or tcl8.4)
+@@ -302,30 +294,7 @@
"_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]
))
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
