kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Critical bug fixes in 2.0.2:

Browse source 
- fixed Qt4 support
- fixed LogFormatter
- fixed hatched artists in legends
- fixed segfault with large images
This commit is contained in:
adam 2017-05-29 20:59:21 +00:00
parent e8a756273b
commit b21c162123
11 changed files with 148 additions and 2125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
graphics/py-matplotlib-gtk2/Makefile
View file

@ -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
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 @@ post-patch:
${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-patch:
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"

33
graphics/py-matplotlib-tk/Makefile
View file

@ -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
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 @@ post-patch:
${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-patch:
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"

7
graphics/py-matplotlib-tk/distinfo
View file

@ -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

13
graphics/py-matplotlib-tk/patches/patch-ab
View file

@ -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())

43
graphics/py-matplotlib/Makefile
View file

@ -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"
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://matplotlib.org/
COMMENT= Matlab-style plotting package for Python
# LICENSE= see ${WRKSRC}/LICENSE/LICENSE
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
COMMENT= Matlab-style plotting package for Python
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
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
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
PY_PATCHPLIST= yes
.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
MPL_PACKAGES= mpl_packages
REPLACE_PYTHON= lib/matplotlib/dates.py
REPLACE_PYTHON+= lib/matplotlib/sankey.py
@ -34,16 +33,12 @@ post-patch:
${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()"

25
graphics/py-matplotlib/Makefile.common Normal file
View file

@ -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
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

2060
graphics/py-matplotlib/PLIST
View file

File diff suppressed because it is too large Load diff

7
graphics/py-matplotlib/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.6 2010/06/10 20:51:05 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.7 2017/05/29 20:59:21 adam Exp $
BUILDLINK_TREE+= pymatplotlib
@ -9,6 +9,11 @@ PYMATPLOTLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.pymatplotlib+= ${PYPKGPREFIX}-matplotlib>=0.87.2
BUILDLINK_PKGSRCDIR.pymatplotlib?= ../../graphics/py-matplotlib
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
.endif # PYMATPLOTLIB_BUILDLINK3_MK
BUILDLINK_TREE+= -pymatplotlib

13
graphics/py-matplotlib/distinfo
View file

@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.25 2016/08/04 00:04:18 kamil Exp $
$NetBSD: distinfo,v 1.26 2017/05/29 20:59:21 adam 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-setup.py) = 9f48a0035dc4573136635842b7b23e4b6dba3f76
SHA1 (matplotlib-2.0.2.tar.gz) = c89a4635d60cc32a89789ccf726133f29b3eac69
RMD160 (matplotlib-2.0.2.tar.gz) = 6121585f3df18db1e7ea409f9b9acd00f2ba26df
SHA512 (matplotlib-2.0.2.tar.gz) = 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f
Size (matplotlib-2.0.2.tar.gz) = 53879938 bytes
SHA1 (patch-setup.py) = bf09fcf6aa197785f6584fd719149f53690b76c0
SHA1 (patch-src___macosx.m) = 5b46ec15d2f66ae1ee489b6714c2731dd476d50c

23
graphics/py-matplotlib/patches/patch-setup.py
View file

@ -1,8 +1,10 @@
$NetBSD: patch-setup.py,v 1.1 2016/08/04 00:04:19 kamil Exp $
$NetBSD: patch-setup.py,v 1.2 2017/05/29 20:59:21 adam Exp $
--- setup.py.orig 2016-07-03 15:37:10.000000000 +0000
Build only selected packages (see Makefile.common).
--- setup.py.orig 2017-05-29 17:27:20.000000000 +0000
+++ setup.py
@@ -97,12 +97,12 @@ mpl_packages = [
@@ -100,12 +100,6 @@ mpl_packages = [
setupext.BackendMacOSX(),
setupext.BackendQt5(),
setupext.BackendQt4(),
@ -12,12 +14,15 @@ $NetBSD: patch-setup.py,v 1.1 2016/08/04 00:04:19 kamil Exp $
- setupext.BackendTkAgg(),
- setupext.BackendWxAgg(),
- setupext.BackendGtk(),
+# setupext.BackendGtk3Agg(),
+# setupext.BackendGtk3Cairo(),
+# setupext.BackendGtkAgg(),
+# setupext.BackendTkAgg(),
+# setupext.BackendWxAgg(),
+# setupext.BackendGtk(),
setupext.BackendAgg(),
setupext.BackendCairo(),
setupext.Windowing(),
@@ -175,7 +175,7 @@ if __name__ == '__main__':
required_failed = []
good_packages = []
- for package in mpl_packages:
+ for package in @MPL_PACKAGES@:
if isinstance(package, str):
print_raw('')
print_raw(package.upper())

17
graphics/py-matplotlib/patches/patch-src___macosx.m Normal file
View file

@ -0,0 +1,17 @@
$NetBSD: patch-src___macosx.m,v 1.1 2017/05/29 20:59:21 adam Exp $
Do not complain about Python.framework and allow working from command-line.
--- src/_macosx.m.orig 2017-05-10 17:14:04.000000000 +0000
+++ src/_macosx.m
@@ -3068,9 +3068,8 @@ static bool verify_framework(void)
switch (activationPolicy) {
case NSApplicationActivationPolicyRegular:
case NSApplicationActivationPolicyAccessory:
- return true;
case NSApplicationActivationPolicyProhibited:
- break;
+ return true;
}
#else
ProcessSerialNumber psn;