[pkgsrc/trunk]: pkgsrc/graphics Critical bug fixes in 2.0.2:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics Critical bug fixes in 2.0.2:
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:14:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/72ab7785c751
branches:  trunk
changeset: 362987:72ab7785c751
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon May 29 20:59:21 2017 +0000

description:
Critical bug fixes in 2.0.2:
- fixed Qt4 support
- fixed LogFormatter
- fixed hatched artists in legends
- fixed segfault with large images

diffstat:

 graphics/py-matplotlib-gtk2/Makefile                |    32 +-
 graphics/py-matplotlib-tk/Makefile                  |    33 +-
 graphics/py-matplotlib-tk/distinfo                  |     7 -
 graphics/py-matplotlib-tk/patches/patch-ab          |    13 -
 graphics/py-matplotlib/Makefile                     |    43 +-
 graphics/py-matplotlib/Makefile.common              |    25 +
 graphics/py-matplotlib/PLIST                        |  2060 +------------------
 graphics/py-matplotlib/buildlink3.mk                |     7 +-
 graphics/py-matplotlib/distinfo                     |    13 +-
 graphics/py-matplotlib/patches/patch-setup.py       |    23 +-
 graphics/py-matplotlib/patches/patch-src___macosx.m |    17 +
 11 files changed, 148 insertions(+), 2125 deletions(-)

diffs (truncated from 2543 to 300 lines):

diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib-gtk2/Makefile
--- a/graphics/py-matplotlib-gtk2/Makefile      Mon May 29 20:55:17 2017 +0000
+++ b/graphics/py-matplotlib-gtk2/Makefile      Mon May 29 20:59:21 2017 +0000
@@ -1,24 +1,13 @@
-# $NetBSD: Makefile,v 1.59 2017/02/12 06:25:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2017/05/29 20:59:21 adam Exp $
 
+.include "../../graphics/py-matplotlib/Makefile.common"
 
-VERSION=               1.5.2
-DISTNAME=              matplotlib-${VERSION}
-PKGNAME=               ${PYPKGPREFIX}-matplotlib-gtk-${VERSION}
-PKGREVISION=           2
-CATEGORIES=            graphics python
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=matplotlib/}
-GITHUB_PROJECT=                matplotlib
-GITHUB_TAG=            v${PKGVERSION_NOREV}
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/-/-gtk-/}
+COMMENT=       GTK frontend for matplotlib
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://matplotlib.sourceforge.net/
-COMMENT=               GTK frontend for matplotlib
+MPL_PACKAGES=  [setupext.Numpy(),setupext.LibAgg(),setupext.BackendGtkAgg(),setupext.BackendGtk()]
 
-USE_TOOLS+=            pkg-config
-PY_PATCHPLIST=         yes
-PYDISTUTILSPKG=                yes
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-gtk2
-USE_LANGUAGES=         c c++
 
 post-patch:
        ( ${ECHO} "[directories]"; \
@@ -28,7 +17,6 @@
        ${ECHO} "dateutil = False"; \
        ${ECHO} "[gui_support]"; \
        ${ECHO} "gtk = True"; \
-       ${ECHO} "gtkagg = True"; \
        ${ECHO} "tkagg = False"; \
        ${ECHO} "wxagg = False"; \
        ${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg
@@ -36,22 +24,14 @@
 post-install:
        ${RM} -r ${DESTDIR}/${PREFIX}/${PYSITELIB}/${EGG_INFODIR}
 
-# It needs:
-# devel/py-cycler
-# devel/py-nose
-# devel/py-mock
 do-test:
        ${ECHO} "backend      : GTKAgg" > ${WRKSRC}/matplotlibrc
-       ${RUN} cd ${WRKSRC} && MPLCONFIGDIR=$PWD \
+       ${RUN} cd ${WRKSRC} && MPLCONFIGDIR=${PWD} \
        MATPLOTLIBDATA=${WRKSRC}/lib/matplotlib/mpl-data \
        PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} \
        ${PYTHONBIN} -c "import matplotlib; matplotlib.test()"
 
 .include "../../lang/python/egg.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../math/py-numpy/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib-tk/Makefile
--- a/graphics/py-matplotlib-tk/Makefile        Mon May 29 20:55:17 2017 +0000
+++ b/graphics/py-matplotlib-tk/Makefile        Mon May 29 20:59:21 2017 +0000
@@ -1,23 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2016/08/03 23:22:14 kamil Exp $
+# $NetBSD: Makefile,v 1.29 2017/05/29 20:59:21 adam Exp $
 
-VERSION=               1.5.2
-DISTNAME=              matplotlib-${VERSION}
-PKGNAME=               ${PYPKGPREFIX}-matplotlib-tk-${VERSION}
-CATEGORIES=            graphics python
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=matplotlib/}
-GITHUB_PROJECT=                matplotlib
-GITHUB_TAG=            v${PKGVERSION_NOREV}
+.include "../../graphics/py-matplotlib/Makefile.common"
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://matplotlib.sourceforge.net/
-COMMENT=               Tk frontend for matplotlib
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/-/-tk-/}
+COMMENT=       Tk frontend for matplotlib
 
-DEPENDS+=              ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
+DEPENDS+=      ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
-USE_TOOLS+=            pkg-config
-PY_PATCHPLIST=         yes
-PYDISTUTILSPKG=                yes
-USE_LANGUAGES=         c c++
+MPL_PACKAGES=  [setupext.Numpy(),setupext.LibAgg(),setupext.BackendTkAgg()]
 
 post-patch:
        ( ${ECHO} "[directories]"; \
@@ -27,7 +17,6 @@
        ${ECHO} "dateutil = False"; \
        ${ECHO} "[gui_support]"; \
        ${ECHO} "gtk = False"; \
-       ${ECHO} "gtkagg = False"; \
        ${ECHO} "tkagg = True"; \
        ${ECHO} "wxagg = False"; \
        ${ECHO} "macosx = False" ) > ${WRKSRC}/setup.cfg
@@ -35,22 +24,14 @@
 post-install:
        ${RM} -r ${DESTDIR}/${PREFIX}/${PYSITELIB}/${EGG_INFODIR}
 
-# It needs:
-# devel/py-cycler
-# devel/py-nose
-# devel/py-mock
 do-test:
        ${ECHO} "backend      : TkAgg" > ${WRKSRC}/matplotlibrc
-       ${RUN} cd ${WRKSRC} && MPLCONFIGDIR=$PWD \
+       ${RUN} cd ${WRKSRC} && MPLCONFIGDIR=${PWD} \
        MATPLOTLIBDATA=${WRKSRC}/lib/matplotlib/mpl-data \
        PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} \
        ${PYTHONBIN} -c "import matplotlib; matplotlib.test()"
 
 .include "../../lang/python/egg.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../math/py-numpy/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib-tk/distinfo
--- a/graphics/py-matplotlib-tk/distinfo        Mon May 29 20:55:17 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.16 2016/08/03 23:22:14 kamil Exp $
-
-SHA1 (matplotlib-1.5.2.tar.gz) = 2c78d4b1d9cc1e064a7592158977cb22d6606ca7
-RMD160 (matplotlib-1.5.2.tar.gz) = 17406f510748a81dc5fc582a61cfba60b7e4bc9a
-SHA512 (matplotlib-1.5.2.tar.gz) = 7d4688665273d30a08edf0cf2414cf0c05c619335f72b190c6ea125687e74cafe6133b7f3b6588e969c931ec8f970593d44654766205e6cc19f760925826a7e3
-Size (matplotlib-1.5.2.tar.gz) = 50914982 bytes
-SHA1 (patch-ab) = c5b5ddcc079cc872601548ee5786fd5637b5aa05
diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib-tk/patches/patch-ab
--- a/graphics/py-matplotlib-tk/patches/patch-ab        Mon May 29 20:55:17 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2016/08/03 23:22:14 kamil Exp $
-
---- setup.py.orig      2013-10-10 12:42:48.000000000 +0000
-+++ setup.py
-@@ -139,7 +139,7 @@ if __name__ == '__main__':
- 
-     required_failed = []
-     good_packages = []
--    for package in mpl_packages:
-+    for package in [setupext.Numpy(),setupext.LibAgg(),setupext.BackendTkAgg()]:
-         if isinstance(package, str):
-             print_raw('')
-             print_raw(package.upper())
diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib/Makefile
--- a/graphics/py-matplotlib/Makefile   Mon May 29 20:55:17 2017 +0000
+++ b/graphics/py-matplotlib/Makefile   Mon May 29 20:59:21 2017 +0000
@@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.46 2017/02/20 17:00:36 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2017/05/29 20:59:21 adam Exp $
 
-DISTNAME=              matplotlib-1.5.2
-PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=           1
-CATEGORIES=            graphics python
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=matplotlib/}
-GITHUB_PROJECT=                matplotlib
-GITHUB_TAG=            v${PKGVERSION_NOREV}
+.include "Makefile.common"
+
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+COMMENT=       Matlab-style plotting package for Python
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://matplotlib.org/
-COMMENT=               Matlab-style plotting package for Python
-# LICENSE=             see ${WRKSRC}/LICENSE/LICENSE
+DEPENDS+=      ${PYPKGPREFIX}-cycler-[0-9]*:../../graphics/py-cycler
+DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+DEPENDS+=      ${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
+DEPENDS+=      ${PYPKGPREFIX}-pyparsing>=1.5.6:../../devel/py-pyparsing
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
-DEPENDS+=              ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+=              ${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
-DEPENDS+=              ${PYPKGPREFIX}-pyparsing>=1.5.6:../../devel/py-pyparsing
-DEPENDS+=              ${PYPKGPREFIX}-cycler-[0-9]*:../../graphics/py-cycler
+.include "../../lang/python/pyversion.mk"
+.if "${PYPKGPREFIX}" == "py27"
+DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+.else
+DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo3
+.endif
 
-USE_LANGUAGES=         c c++
-USE_TOOLS+=            pkg-config
-PY_PATCHPLIST=         yes
+MPL_PACKAGES=  mpl_packages
 
 REPLACE_PYTHON=                lib/matplotlib/dates.py
 REPLACE_PYTHON+=       lib/matplotlib/sankey.py
@@ -34,16 +33,12 @@
        ${ECHO} "basedirlist=/usr"; \
        ${ECHO} "[gui_support]"; \
        ${ECHO} "gtk = False"; \
-       ${ECHO} "gtkagg = False"; \
        ${ECHO} "tkagg = False"; \
        ${ECHO} "wxagg = False" ) > ${WRKSRC}/setup.cfg
 
-# It needs:
-# devel/py-nose
-# devel/py-mock
 do-test:
        ${ECHO} "backend      : GTKAgg" > ${WRKSRC}/matplotlibrc
-       ${RUN} cd ${WRKSRC} && MPLCONFIGDIR=$PWD \
+       ${RUN} cd ${WRKSRC} && MPLCONFIGDIR=${PWD} \
        MATPLOTLIBDATA=${WRKSRC}/lib/matplotlib/mpl-data \
        PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} \
        ${PYTHONBIN} -c "import matplotlib; matplotlib.test()"
diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/py-matplotlib/Makefile.common    Mon May 29 20:59:21 2017 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile.common,v 1.1 2017/05/29 20:59:21 adam Exp $
+# used by graphics/py-matplotlib/Makefile
+# used by graphics/py-matplotlib-gtk2/Makefile
+# used by graphics/py-matplotlib-tk/Makefile
+
+DISTNAME=      matplotlib-2.0.2
+CATEGORIES=    graphics python
+MASTER_SITES=  ${MASTER_SITE_PYPI:=m/matplotlib/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://matplotlib.org/
+# LICENSE=     see ${WRKSRC}/LICENSE/LICENSE
+
+DISTINFO_FILE= ${.CURDIR}/../../graphics/py-matplotlib/distinfo
+PATCHDIR=      ${.CURDIR}/../../graphics/py-matplotlib/patches
+
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
+
+# see patch-setup.py
+SUBST_CLASSES+=                mplpkgs
+SUBST_STAGE.mplpkgs=   pre-configure
+SUBST_MESSAGE.mplpkgs= Selecting mpl packages.
+SUBST_FILES.mplpkgs=   setup.py
+SUBST_VARS.mplpkgs=    MPL_PACKAGES
diff -r 59cfdfaa8362 -r 72ab7785c751 graphics/py-matplotlib/PLIST
--- a/graphics/py-matplotlib/PLIST      Mon May 29 20:55:17 2017 +0000
+++ b/graphics/py-matplotlib/PLIST      Mon May 29 20:59:21 2017 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2016/08/04 00:04:18 kamil Exp $
-${PYSITELIB}/${EGG_NAME}-nspkg.pth
+@comment $NetBSD: PLIST,v 1.20 2017/05/29 20:59:21 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -7,6 +6,7 @@
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_NAME}-nspkg.pth
 ${PYSITELIB}/matplotlib/__init__.py
 ${PYSITELIB}/matplotlib/__init__.pyc
 ${PYSITELIB}/matplotlib/__init__.pyo
@@ -17,6 +17,9 @@
 ${PYSITELIB}/matplotlib/_cm_listed.pyc
 ${PYSITELIB}/matplotlib/_cm_listed.pyo
 ${PYSITELIB}/matplotlib/_cntr.so
+${PYSITELIB}/matplotlib/_color_data.py
+${PYSITELIB}/matplotlib/_color_data.pyc
+${PYSITELIB}/matplotlib/_color_data.pyo
 ${PYSITELIB}/matplotlib/_contour.so
 ${PYSITELIB}/matplotlib/_delaunay.so
 ${PYSITELIB}/matplotlib/_image.so
@@ -66,9 +69,6 @@
 ${PYSITELIB}/matplotlib/backend_tools.py
 ${PYSITELIB}/matplotlib/backend_tools.pyc
 ${PYSITELIB}/matplotlib/backend_tools.pyo
-${PYSITELIB}/matplotlib/backends/Matplotlib.nib/classes.nib
-${PYSITELIB}/matplotlib/backends/Matplotlib.nib/info.nib
-${PYSITELIB}/matplotlib/backends/Matplotlib.nib/keyedobjects.nib
 ${PYSITELIB}/matplotlib/backends/__init__.py
 ${PYSITELIB}/matplotlib/backends/__init__.pyc
 ${PYSITELIB}/matplotlib/backends/__init__.pyo
@@ -79,9 +79,6 @@
 ${PYSITELIB}/matplotlib/backends/backend_cairo.py
 ${PYSITELIB}/matplotlib/backends/backend_cairo.pyc
 ${PYSITELIB}/matplotlib/backends/backend_cairo.pyo
-${PYSITELIB}/matplotlib/backends/backend_cocoaagg.py
-${PYSITELIB}/matplotlib/backends/backend_cocoaagg.pyc
-${PYSITELIB}/matplotlib/backends/backend_cocoaagg.pyo
 ${PYSITELIB}/matplotlib/backends/backend_gdk.py
 ${PYSITELIB}/matplotlib/backends/backend_gdk.pyc
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/sysupgrade Fix ownership of ${VARBASE}/cache/...
Next by Date: [pkgsrc/trunk]: pkgsrc/comms/asterisk13 Add fixes for AST-2017-002, AST-2017-...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/sysupgrade Fix ownership of ${VARBASE}/cache/...
Next by Thread: [pkgsrc/trunk]: pkgsrc/comms/asterisk13 Add fixes for AST-2017-002, AST-2017-...
Indexes:
Home | Main Index | Thread Index | Old Index