Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14099/stable/main/finkinfo/sci
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
new version from 10.[78]
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- matplotlib-py.patch 25 May 2012 16:31:22 -0000 1.3
+++ matplotlib-py.patch 1 Apr 2013 02:16:33 -0000 1.4
@@ -1,43 +1,48 @@
-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]
+diff -ruNd matplotlib-1.2.0.orig/setup.cfg.template
matplotlib-1.2.0/setup.cfg.template
+--- matplotlib-1.2.0.orig/setup.cfg.template 2012-11-06 14:31:09.000000000
-0800
++++ matplotlib-1.2.0/setup.cfg.template 2013-01-19 07:08:55.000000000
-0800
+@@ -59,6 +59,11 @@
+ #gtkagg = False
+ #tkagg = False
+ #macosx = False
+gtk = True
+gtkagg = True
+tkagg = True
-+wxagg = False
++wxagg = True
+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 @@
+
+ [rc_options]
+ # User-configurable options
+diff -ruNd matplotlib-1.2.0.orig/setup.py matplotlib-1.2.0/setup.py
+--- matplotlib-1.2.0.orig/setup.py 2012-11-07 18:24:12.000000000 -0800
++++ matplotlib-1.2.0/setup.py 2013-01-19 07:15:38.000000000 -0800
+@@ -267,6 +267,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')
-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'],
-
- 'freebsd4' : ['/usr/local', '/usr'],
- 'freebsd5' : ['/usr/local', '/usr'],
-@@ -1011,6 +1012,17 @@
- module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
+diff -ruNd matplotlib-1.2.0.orig/setupext.py matplotlib-1.2.0/setupext.py
+--- matplotlib-1.2.0.orig/setupext.py 2012-11-06 14:31:09.000000000 -0800
++++ matplotlib-1.2.0/setupext.py 2013-01-19 07:21:33.000000000 -0800
+@@ -57,7 +57,8 @@
+ basedir = defaultdict(lambda: ['/usr/local', '/usr'], {
+ # execptions to the ['/usr/local', '/usr'] defaults
+ 'win32' : ['win32_static',],
+- 'darwin' : ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
++ 'darwin' : ['/usr', '/usr/X11',
++ '/opt/X11', '@PREFIX@/lib/freetype219', '@PREFIX@',],
+ 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
+ 'gnu0' : ['/usr'],
+ 'aix5' : ['/usr/local'],
+@@ -1002,6 +1003,17 @@
+ # this config section lifted directly from Imaging - thanks to
+ # the effbot!
- elif sys.platform == 'darwin':
+ tcl_inc = "@PREFIX@/include"
+ tk_inc = "@PREFIX@/include"
+ tcl_lib = "@PREFIX@/lib"
@@ -49,17 +54,6 @@
+ module.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver])
+
+ elif False:
- # this config section lifted directly from Imaging - thanks to
- # the effbot!
-
---- matplotlib-1.1.0/agg24/include/agg_renderer_outline_aa.h.orig
2012-03-17 12:08:05.000000000 -0400
-+++ matplotlib-1.1.0/agg24/include/agg_renderer_outline_aa.h 2012-03-17
12:08:30.000000000 -0400
-@@ -1365,7 +1365,7 @@
-
//---------------------------------------------------------------------
- void profile(const line_profile_aa& prof) { m_profile = &prof; }
- const line_profile_aa& profile() const { return *m_profile; }
-- line_profile_aa& profile() { return *m_profile; }
-+ const line_profile_aa& profile() { return *m_profile; }
-
-
//---------------------------------------------------------------------
- int subpixel_width() const { return m_profile->subpixel_width(); }
+ # First test for a MacOSX/darwin framework install
+ from os.path import join, exists
+ framework_dirs = [
Index: matplotlib-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- matplotlib-py.info 30 May 2012 19:14:18 -0000 1.9
+++ matplotlib-py.info 1 Apr 2013 02:16:33 -0000 1.10
@@ -3,12 +3,12 @@
# https://github.com/matplotlib/matplotlib/issues/434
Package: matplotlib-py%type_pkg[python]
-Version: 1.1.0
-Revision: 3
-Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
-Type: python (2.4 2.5 2.6 2.7)
+Version: 1.2.1
+Revision: 1
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 57a627f30b3b27821f808659889514c2
+Source-MD5: 326a959c4c3f85417a3daf805cfb54f9
+Distribution: (%type_pkg[python] = 24) 10.5
+Type: python (2.4 2.5 2.6 2.7)
Maintainer: Kurt Schwehr <goat...@users.sourceforge.net>
Depends: <<
@@ -33,6 +33,8 @@
tetex-base,
x11-shlibs
<<
+# wxgtk2.8-py27,
+
BuildDepends: <<
fink (>= 0.24.12),
@@ -68,7 +70,7 @@
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
PatchFile: %{ni}.patch
-PatchFile-MD5: dbd6b6fe0e8bf4ad2115c73d05157783
+PatchFile-MD5: b311a9e244d77d61df791dcdd26a4db2
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
@@ -109,12 +111,8 @@
Use clang fix from
https://github.com/mdboom/matplotlib/commit/3b0f5959bbea065b07538f9952ae520ab5a06c27.
<<
-DescPort: <<
--DNSIG is only need for the build of the py25 variant. Don't know why.
-<<
Homepage: http://matplotlib.sf.net
DescUsage: <<
The pylab frontend is broken on x86_64.
<<
-
<<
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
