SF.net SVN: gar:[22909] csw/mgar/pkg

[opk at users.sourceforge.net]

Revision: 22909
          http://sourceforge.net/p/gar/code/22909
Author:   opk
Date:     2014-01-28 12:36:44 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
lang-python/matplotlib: had problems with Python 2.6, seems to work with 2.7

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
    csw/mgar/pkg/lang-python/matplotlib/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-python/matplotlib/
    csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch

Removed Paths:
-------------
    csw/mgar/pkg/matplotlib/

Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/matplotlib/trunk/Makefile	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile	2014-01-28 12:36:44 UTC (rev 22909)
@@ -9,14 +9,45 @@
 # upstream bug: http://bugs.python.org/issue1250
 
 NAME = matplotlib
-VERSION = 1.1.0
+VERSION = 1.3.1
 CATEGORIES = python
-DESCRIPTION = A pure python plotting library
+CATALOGNAME = py_matplotlib
+
+DESCRIPTION = Python 2D plotting library
 define BLURB
+  Matplotlib is a python 2D plotting library which produces publication
+  quality figures in a variety of hardcopy formats and interactive
+  environments across platforms. matplotlib can be used in python scripts,
+  the python and ipython shell, web application servers, and six
+  graphical user interface toolkits.
 endef
+
 SPKG_SOURCEURL = http://matplotlib.sourceforge.net/
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
-LICENSE = LICENSE.txt
+LICENSE = LICENSE/LICENSE
+
+BUILD_DEP_PKGS = CSWpython27-dev
+
+RUNTIME_DEP_PKGS = CSWlibatk
+RUNTIME_DEP_PKGS += CSWggettextrt
+RUNTIME_DEP_PKGS += CSWpng
+RUNTIME_DEP_PKGS += CSWfconfig
+RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS += CSWglib2
+RUNTIME_DEP_PKGS += CSWftype2
+RUNTIME_DEP_PKGS += CSWpango
+RUNTIME_DEP_PKGS += CSWlibcairo
+RUNTIME_DEP_PKGS += CSWgtk2
+RUNTIME_DEP_PKGS += CSWzlib
+
+PATCHFILES += 0001-avoid-reserved-variable-names.patch
+MODULATIONS_PYTHON_VERSION = 2_7
 CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_MERGE_EXCLUDE_FILES += .*\.egg-info.* .*\.pyo .*\.pyc
+
+pre-configure:
+	@rm -f work/build-isa-sparcv8/$(GARNAME)-$(GARVERSION)/lib/$(GARNAME)/tests/baseline_images/test_axes/shaped\ data.svg
+	@$(MAKECOOKIE)
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/matplotlib/trunk/checksums	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/checksums	2014-01-28 12:36:44 UTC (rev 22909)
@@ -1 +1 @@
-57a627f30b3b27821f808659889514c2  matplotlib-1.1.0.tar.gz
+444624ad58de05f9029b0b5811e11c17  matplotlib-1.3.1.tar.gz

Added: csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch
===================================================================
--- csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch	2014-01-28 12:36:44 UTC (rev 22909)
@@ -0,0 +1,48 @@
+From bf6bfdd8c9591de27eceeb1ad18a0b18842796a4 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at csw.org>
+Date: Tue, 28 Jan 2014 12:26:44 +0000
+Subject: [PATCH] avoid reserved variable names
+
+---
+ lib/matplotlib/tri/_tri.cpp | 6 +++---
+ lib/matplotlib/tri/_tri.h   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
+index 9dd538a..ce5260b 100644
+--- a/lib/matplotlib/tri/_tri.cpp
++++ b/lib/matplotlib/tri/_tri.cpp
+@@ -2177,14 +2177,14 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_)
+ 
+ 
+ RandomNumberGenerator::RandomNumberGenerator(unsigned long seed)
+-    : _M(21870), _A(1291), _C(4621), _seed(seed % _M)
++    : M_(21870), A_(1291), C_(4621), _seed(seed % M_)
+ {}
+ 
+ unsigned long
+ RandomNumberGenerator::operator()(unsigned long max_value)
+ {
+-    _seed = (_seed*_A + _C) % _M;
+-    return (_seed*max_value) / _M;
++    _seed = (_seed*A_ + C_) % M_;
++    return (_seed*max_value) / M_;
+ }
+ 
+ 
+diff --git a/lib/matplotlib/tri/_tri.h b/lib/matplotlib/tri/_tri.h
+index 3662678..0d5acef 100644
+--- a/lib/matplotlib/tri/_tri.h
++++ b/lib/matplotlib/tri/_tri.h
+@@ -818,7 +818,7 @@ public:
+     unsigned long operator()(unsigned long max_value);
+ 
+ private:
+-    const unsigned long _M, _A, _C;
++    const unsigned long M_, A_, C_;
+     unsigned long _seed;
+ };
+ 
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.