Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sc8-pr-cvs17:/tmp/cvs-serv19708
Modified Files: matplotlib-py.info matplotlib-py.patch Log Message: new upstream version. Index: matplotlib-py.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- matplotlib-py.patch 8 Nov 2006 00:13:40 -0000 1.11 +++ matplotlib-py.patch 3 Jun 2007 12:56:11 -0000 1.12 @@ -1,16 +1,16 @@ ---- matplotlib/setupext.py.orig 2006-10-28 07:29:32.000000000 -0600 -+++ matplotlib/setupext.py 2006-10-28 07:30:35.000000000 -0600 -@@ -49,7 +49,7 @@ +--- matplotlib/setupext.py.orig 2007-02-26 01:30:45.000000000 -0700 ++++ matplotlib/setupext.py 2007-06-03 05:46:55.000000000 -0600 +@@ -48,8 +48,7 @@ + 'linux2' : ['/usr/local', '/usr',], 'linux' : ['/usr/local', '/usr',], 'cygwin' : ['/usr/local', '/usr',], - 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local', - '/usr', '/sw'], -+ 'darwin' : ['@PREFIX@/lib/freetype2', '@PREFIX@/lib/freetype219', '/usr/local', -+ '/usr', '@PREFIX@'], ++ 'darwin' : ['@PREFIX@/lib/freetype2', '@PREFIX@/lib/freetype219', '/usr/local', '/usr', '@PREFIX@' ], 'freebsd4' : ['/usr/local', '/usr'], 'freebsd5' : ['/usr/local', '/usr'], 'freebsd6' : ['/usr/local', '/usr'], -@@ -334,57 +334,12 @@ +@@ -342,57 +341,12 @@ def find_tcltk(): """Finds Tcl/Tk includes/libraries/version by interrogating Tkinter.""" @@ -73,9 +73,9 @@ return o ---- matplotlib/setup.py.orig 2006-10-28 07:29:41.000000000 -0600 -+++ matplotlib/setup.py 2006-10-28 07:33:18.000000000 -0600 -@@ -28,21 +28,21 @@ +--- matplotlib/setup.py.orig 2007-06-03 05:47:31.000000000 -0600 ++++ matplotlib/setup.py 2007-06-03 05:49:58.000000000 -0600 +@@ -28,13 +28,13 @@ # it. It makes very nice antialiased output and also supports alpha # blending BUILD_AGG = 1 @@ -90,65 +90,33 @@ -BUILD_TKAGG = 'auto' +BUILD_TKAGG = 1 - # build wxPython GUI with Agg renderer ; requires wxPython package --BUILD_WXAGG = 'auto' -+BUILD_WXAGG = 0 + # build wxPython extension code to efficiently blit agg into wx. Only + # needed for wxpython <2.8 if you plan on doing animations +@@ -42,8 +42,8 @@ # build a small extension to manage the focus on win32 platforms. - #BUILD_WINDOWING = 0 +-#BUILD_WINDOWING = 0 -BUILD_WINDOWING = 'auto' +BUILD_WINDOWING = 0 ++#BUILD_WINDOWING = 'auto' VERBOSE = False # insert lots of diagnostic prints in extension code -@@ -201,80 +201,22 @@ - build_enthought(ext_modules, packages) +@@ -226,35 +226,19 @@ - if BUILD_GTK: -- try: -- import gtk -- except ImportError: -- print 'GTK requires pygtk' -- BUILD_GTK = 0 -- except RuntimeError: -- print 'pygtk present but import failed' -- BUILD_GTK = 0 -- else: -- version = (2,2,0) -- if gtk.pygtk_version < version: -- print "Error: GTK backend requires PyGTK %d.%d.%d (or later), " \ -- "%d.%d.%d was detected." % ( -- version + gtk.pygtk_version) -- BUILD_GTK = 0 -- else: -- build_gdk(ext_modules, packages, NUMERIX) -- rc['backend'] = 'GTK' -+ build_gdk(ext_modules, packages, NUMERIX) -+ rc['backend'] = 'GTK' + havegtk.gotit = None - if BUILD_GTKAGG: -- try: -- import gtk -- except ImportError: -- print 'GTKAgg requires pygtk' -- BUILD_GTKAGG=0 -- except RuntimeError: -- print 'pygtk present but import failed' -- BUILD_GTKAGG = 0 -- else: -- version = (2,2,0) -- if gtk.pygtk_version < version: -- print "Error: GTKAgg backend requires PyGTK %d.%d.%d " \ -- "(or later), %d.%d.%d was detected." % ( -- version + gtk.pygtk_version) -- BUILD_GTKAGG=0 -- else: -- BUILD_AGG = 1 -- build_gtkagg(ext_modules, packages, NUMERIX) -- rc['backend'] = 'GTKAgg' -+ build_gtkagg(ext_modules, packages, NUMERIX) -+ rc['backend'] = 'GTKAgg' +-if BUILD_GTK and havegtk(): ++if BUILD_GTK: + build_gdk(ext_modules, packages, NUMERIX) + rc['backend'] = 'GTK' + +-if BUILD_GTKAGG and havegtk(): ++if BUILD_GTKAGG: + BUILD_AGG = 1 + build_gtkagg(ext_modules, packages, NUMERIX) + rc['backend'] = 'GTKAgg' if BUILD_TKAGG: - try: @@ -170,30 +138,13 @@ - BUILD_AGG = 1 - build_tkagg(ext_modules, packages, NUMERIX) - rc['backend'] = 'TkAgg' ++ BUILD_AGG = 1 + build_tkagg(ext_modules, packages, NUMERIX) + rc['backend'] = 'TkAgg' if BUILD_WXAGG: -- try: -- import wxPython -- except ImportError: -- if BUILD_WXAGG != 'auto': -- print 'WXAgg\'s accelerator requires wxPython' -- BUILD_WXAGG = 0 -- else: -- BUILD_AGG = 1 -- build_wxagg(ext_modules, packages, NUMERIX, -- not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG -- and BUILD_WXAGG.lower() == 'auto')) # is "auto" -- rc['backend'] = 'WXAgg' -+ build_wxagg(ext_modules, packages, NUMERIX, -+ not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG -+ and BUILD_WXAGG.lower() == 'auto')) # is "auto" -+ rc['backend'] = 'WXAgg' - - if BUILD_AGG: - build_agg(ext_modules, packages, NUMERIX) -@@ -298,6 +240,8 @@ + try: +@@ -293,6 +277,8 @@ for mod in ext_modules: if VERBOSE: mod.extra_compile_args.append('-DVERBOSE') Index: matplotlib-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.info,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- matplotlib-py.info 22 Mar 2007 12:17:33 -0000 1.15 +++ matplotlib-py.info 3 Jun 2007 12:56:11 -0000 1.16 @@ -1,13 +1,13 @@ Info2: << Package: matplotlib-py%type_pkg[python] -Version: 0.90.0 +Version: 0.90.1 Revision: 1 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]> Depends: python%type_pkg[python], pygobject2-py%type_pkg[python], pygtk2-gtk-py%type_pkg[python], tcltk-shlibs, numarray-py%type_pkg[python] (>= 1.5.2-1), numeric-py%type_pkg[python] (>= 24.2-1), freetype219-shlibs, tetex-base, scipy-core-py%type_pkg[python] (>= 1.0-4) BuildDepends: pygobject2-py%type_pkg[python]-dev, pygtk2-gtk-py%type_pkg[python]-dev, tcltk-dev, glib2-dev, gtk+2-dev, atk1, pango1-xft2-dev, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, pkgconfig, freetype219, libpng3 Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz -Source-MD5: 31ea12395826080b5be9c1e292cda6f1 +Source-MD5: e1344bd72660e7c9c0b7540a72cc45b8 Type: python (2.4 2.5) GCC: 4.0 NoSetCPPFLAGS: True ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits