Revision: 26164
http://sourceforge.net/p/gar/code/26164
Author: dmichelsen
Date: 2017-04-27 12:58:18 +0000 (Thu, 27 Apr 2017)
Log Message:
-----------
lang-python/matplotlib/trunk: Update to 2.0.0
Modified Paths:
--------------
csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
csw/mgar/pkg/lang-python/matplotlib/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch
Modified: csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile 2017-04-27 12:43:42 UTC
(rev 26163)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/Makefile 2017-04-27 12:58:18 UTC
(rev 26164)
@@ -9,7 +9,7 @@
# upstream bug: http://bugs.python.org/issue1250
NAME = matplotlib
-VERSION = 1.3.1
+VERSION = 2.0.0
CATEGORIES = python
CATALOGNAME = py_matplotlib
@@ -22,34 +22,33 @@
graphical user interface toolkits.
endef
-SPKG_SOURCEURL = http://matplotlib.sourceforge.net/
+VENDOR_URL = http://matplotlib.sourceforge.net/
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
LICENSE = LICENSE/LICENSE
+MODULATIONS_PYTHON_VERSION = 2_7
+
BUILD_DEP_PKGS = CSWpython27-dev
-RUNTIME_DEP_PKGS = CSWlibpython2-7-1-0
-RUNTIME_DEP_PKGS += CSWlibstdc++6
-RUNTIME_DEP_PKGS += CSWlibpng15-15
-RUNTIME_DEP_PKGS += CSWlibgcc-s1
-RUNTIME_DEP_PKGS += CSWlibfreetype6
-RUNTIME_DEP_PKGS += CSWpy-pyparsing
+PACKAGES += CSWpy-matplotlib
+SPKG_DESC_CSWpy-matplotlib = Python 2D plotting library
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibpython2-7-1-0
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibpng16-16
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWpy-pyparsing
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWpy-matplotlib += CSWlibglib2-0-0
CHECKPKG_OVERRIDES_CSWpy-matplotlib += python-package-missing-py26-files
CHECKPKG_OVERRIDES_CSWpy-matplotlib +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/dviread.py
CHECKPKG_OVERRIDES_CSWpy-matplotlib +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/font_manager.py
-CHECKPKG_OVERRIDES_CSWpy-matplotlib +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/_mathtext_data.py
-CHECKPKG_OVERRIDES_CSWpy-matplotlib +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/matplotlib/tests/test_agg.py
CHECKPKG_OVERRIDES_CSWpy-matplotlib +=
file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/matplotlib/font_manager.py
-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/lang-python/matplotlib/trunk/checksums 2017-04-27 12:43:42 UTC
(rev 26163)
+++ csw/mgar/pkg/lang-python/matplotlib/trunk/checksums 2017-04-27 12:58:18 UTC
(rev 26164)
@@ -1 +1 @@
-444624ad58de05f9029b0b5811e11c17 matplotlib-1.3.1.tar.gz
+ce5f3297f9511effd43877cd425293d3 matplotlib-2.0.0.tar.gz
Deleted:
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
2017-04-27 12:43:42 UTC (rev 26163)
+++
csw/mgar/pkg/lang-python/matplotlib/trunk/files/0001-avoid-reserved-variable-names.patch
2017-04-27 12:58:18 UTC (rev 26164)
@@ -1,48 +0,0 @@
-From bf6bfdd8c9591de27eceeb1ad18a0b18842796a4 Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <o...@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.
