Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv1945
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
Reworked the patch to be based on 1.0.1.
Reordered the mod inc / lib dirs in setup.py.
I think they were not being added (only in verbose mode)
Not sure they do anything as those line pre-date my maintaining the package
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- matplotlib-py.patch 7 Aug 2010 12:35:57 -0000 1.16
+++ matplotlib-py.patch 14 Jun 2011 14:02:43 -0000 1.17
@@ -1,38 +1,41 @@
-diff -Nurd -x'*~' matplotlib-0.91.3.orig/setup.cfg matplotlib-0.91.3/setup.cfg
---- matplotlib-0.91.3.orig/setup.cfg 1969-12-31 19:00:00.000000000 -0500
-+++ matplotlib-0.91.3/setup.cfg 2008-06-18 14:02:04.000000000 -0400
-@@ -0,0 +1,5 @@
+diff -Nurd matplotlib-1.0.1.orig/setup.cfg matplotlib-1.0.1/setup.cfg
+--- matplotlib-1.0.1.orig/setup.cfg 1969-12-31 19:00:00.000000000 -0500
++++ matplotlib-1.0.1/setup.cfg 2011-06-07 21:42:17.000000000 -0400
+@@ -0,0 +1,6 @@
+[gui_support]
+gtk = True
+gtkagg = True
+tkagg = True
+wxagg = False
-diff -Nurd -x'*~' matplotlib-0.91.3.orig/setup.py matplotlib-0.91.3/setup.py
---- matplotlib-0.91.3.orig/setup.py 2008-05-29 18:47:15.000000000 -0400
-+++ matplotlib-0.91.3/setup.py 2008-06-18 13:30:19.000000000 -0400
-@@ -255,6 +255,8 @@
++macosx = True
+diff -Nurd matplotlib-1.0.1.orig/setup.py matplotlib-1.0.1/setup.py
+--- matplotlib-1.0.1.orig/setup.py 2010-07-06 21:41:55.000000000 -0400
++++ matplotlib-1.0.1/setup.py 2011-06-07 21:43:20.000000000 -0400
+@@ -264,6 +264,9 @@
+ except NameError: additional_params = {}
+
for mod in ext_modules:
++ mod.include_dirs.append('@PREFIX@/include')
++ mod.library_dirs.append('@PREFIX@/lib')
++
if options['verbose']:
mod.extra_compile_args.append('-DVERBOSE')
-+ mod.include_dirs.append('@PREFIX@/include')
-+ mod.library_dirs.append('@PREFIX@/lib')
- distrib = setup(name="matplotlib",
- version= __version__,
-diff -Nurd -x'*~' matplotlib-0.91.3.orig/setupext.py
matplotlib-0.91.3/setupext.py
---- matplotlib-0.91.3.orig/setupext.py.orig 2010-07-06 16:44:15.000000000
+0200
-+++ matplotlib-0.91.3.orig/setupext.py 2010-07-21 13:09:59.000000000
+0200
-@@ -63,8 +63,8 @@
+diff -Nurd matplotlib-1.0.1.orig/setupext.py matplotlib-1.0.1/setupext.py
+--- matplotlib-1.0.1.orig/setupext.py 2010-07-06 21:41:55.000000000 -0400
++++ matplotlib-1.0.1/setupext.py 2011-06-07 21:44:14.000000000 -0400
+@@ -63,7 +63,8 @@
# people to :
# make -f make.osx fetch deps mpl_build mpl_install
-
+
- 'darwin' : [],
--
+ 'darwin' : ['@PREFIX@/lib/freetype219', '@PREFIX@',
-+ '/usr/X11', '/usr/X11R6', '/usr'],
++ '/usr/X11', '/usr/X11R6', '/usr'],
+
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
- 'freebsd6' : ['/usr/local', '/usr'],
+@@ -1011,6 +1012,17 @@
+ module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
elif sys.platform == 'darwin':
+ tcl_inc = "@PREFIX@/include"
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- matplotlib-py.info 28 Sep 2010 23:56:35 -0000 1.32
+++ matplotlib-py.info 14 Jun 2011 14:02:43 -0000 1.33
@@ -1,7 +1,7 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 1.0.0
+Version: 1.0.1
Revision: 1
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Maintainer: Kurt Schwehr <[email protected]>
@@ -14,9 +14,9 @@
freetype219-shlibs (>= 2.3.5-1),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
- libgettext3-shlibs,
+ libgettext8-shlibs,
libiconv,
- libpng3-shlibs,
+ libpng14-shlibs,
numarray-py%type_pkg[python] (>= 1.5.2-1),
numeric-py%type_pkg[python] (>= 24.2-1),
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
@@ -29,6 +29,9 @@
tetex-base,
x11-shlibs
<<
+# FIX: do we need numarray? Can it be removed or replaced?
+
+
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.6-1),
@@ -41,9 +44,9 @@
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
- libgettext3-dev,
+ libgettext8-dev,
libiconv-dev,
- libpng3,
+ libpng14,
pango1-xft2-ft219-dev (>= 1.18.4-4),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
@@ -55,7 +58,7 @@
xft2-dev
<<
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 7d964de548c9887917762a11e0ffecd3
+Source-MD5: 2196c0482d5b33dc8d33f67bbafc1323
Type: python (2.4 2.5 2.6 2.7)
GCC: 4.0
NoSetCPPFLAGS: True
@@ -63,7 +66,7 @@
NoSetLDFLAGS: True
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
PatchFile: %{ni}.patch
-PatchFile-MD5: 720ae7d529daadc13eab49f7eb5c709a
+PatchFile-MD5: 758179e681590f68d65f36344a5e268f
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
