cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to matplotlib-2.2.4.

Browse Source 
Reply daniel@ (maintainer): "Put it in..."
This commit is contained in:
bket 2019-05-01 11:38:52 +00:00
parent 82c6b74494
commit f04da4f3ac
7 changed files with 710 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/py-matplotlib/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.74 2019/04/28 20:51:41 sthen Exp $
# $OpenBSD: Makefile,v 1.75 2019/05/01 11:38:52 bket Exp $
COMMENT= Python charting and plotting API
MODPY_EGG_VERSION = 2.0.2
MODPY_EGG_VERSION = 2.2.4
DISTNAME = matplotlib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
CATEGORIES = graphics devel math
@ -31,6 +30,7 @@ MODPY_SETUPTOOLS = Yes
COMMON_DEPENDS= devel/py-tz${MODPY_FLAVOR} \
devel/py-dateutil${MODPY_FLAVOR} \
devel/py-kiwisolver${MODPY_FLAVOR} \
devel/py-parsing${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR} \
@ -38,11 +38,12 @@ COMMON_DEPENDS= devel/py-tz${MODPY_FLAVOR} \
graphics/py-cycler${MODPY_FLAVOR} \
${MODPY_TKINTER_DEPENDS}
BUILD_DEPENDS= ${COMMON_DEPENDS}
BUILD_DEPENDS= ${COMMON_DEPENDS} \
textproc/py-sphinx${MODPY_FLAVOR}
RUN_DEPENDS= ${COMMON_DEPENDS}
LIB_DEPENDS= graphics/png
TEST_DEPENDS = ${RUN_DEPENDS} \
devel/py-nose${MODPY_FLAVOR}
devel/py-test${MODPY_FLAVOR}
.if ${FLAVOR:Mpython3}
@ -58,6 +59,7 @@ WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gtk-x11-2.0
WANTLIB += harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 xcb xcb-render xcb-shm
COMMON_DEPENDS += x11/py-gtk2 \
devel/py-backports-functools-lru-cache \
devel/py-functools32 \
devel/py-subprocess32
LIB_DEPENDS += x11/gtk+2
@ -74,7 +76,6 @@ post-patch:
pre-configure:
@find ${WRKSRC}/examples -name \*.py | xargs ${MODPY_BIN_ADJ}
${SUBST_CMD} ${WRKSRC}/setupext.py
${SUBST_CMD} ${WRKSRC}/lib/matplotlib/sphinxext/tests/test_tinypages.py
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}

4
graphics/py-matplotlib/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (matplotlib-2.0.2.tar.gz) = D/vET6o0qLFwS8EIxFHs+HmI+QDvfOdXuOLoQ4MSH/E=
SIZE (matplotlib-2.0.2.tar.gz) = 53879938
SHA256 (matplotlib-2.2.4.tar.gz) = ApYgeZ5YGAKWGsHc/1y10+4vYC4NucDyAqkElbN9ISY=
SIZE (matplotlib-2.2.4.tar.gz) = 36974286

88
graphics/py-matplotlib/patches/patch-extern_ttconv_pprdrv_tt_cpp
View File

@ -1,88 +0,0 @@
$OpenBSD: patch-extern_ttconv_pprdrv_tt_cpp,v 1.1 2018/04/08 14:06:04 jasper Exp $
error: cast from pointer to smaller type 'char' loses information
Index: extern/ttconv/pprdrv_tt.cpp
--- extern/ttconv/pprdrv_tt.cpp.orig
+++ extern/ttconv/pprdrv_tt.cpp
@@ -242,7 +242,7 @@ void Read_name(struct TTFONT *font)
{
font->Copyright = (char*)calloc(sizeof(char),length+1);
strncpy(font->Copyright,(const char*)strings+offset,length);
- font->Copyright[length]=(char)NULL;
+ font->Copyright[length]='\0';
replace_newlines_with_spaces(font->Copyright);
#ifdef DEBUG_TRUETYPE
@@ -258,7 +258,7 @@ void Read_name(struct TTFONT *font)
free(font->FamilyName);
font->FamilyName = (char*)calloc(sizeof(char),length+1);
strncpy(font->FamilyName,(const char*)strings+offset,length);
- font->FamilyName[length]=(char)NULL;
+ font->FamilyName[length]='\0';
replace_newlines_with_spaces(font->FamilyName);
#ifdef DEBUG_TRUETYPE
@@ -274,7 +274,7 @@ void Read_name(struct TTFONT *font)
free(font->Style);
font->Style = (char*)calloc(sizeof(char),length+1);
strncpy(font->Style,(const char*)strings+offset,length);
- font->Style[length]=(char)NULL;
+ font->Style[length]='\0';
replace_newlines_with_spaces(font->Style);
#ifdef DEBUG_TRUETYPE
@@ -290,7 +290,7 @@ void Read_name(struct TTFONT *font)
free(font->FullName);
font->FullName = (char*)calloc(sizeof(char),length+1);
strncpy(font->FullName,(const char*)strings+offset,length);
- font->FullName[length]=(char)NULL;
+ font->FullName[length]='\0';
replace_newlines_with_spaces(font->FullName);
#ifdef DEBUG_TRUETYPE
@@ -306,7 +306,7 @@ void Read_name(struct TTFONT *font)
free(font->Version);
font->Version = (char*)calloc(sizeof(char),length+1);
strncpy(font->Version,(const char*)strings+offset,length);
- font->Version[length]=(char)NULL;
+ font->Version[length]='\0';
replace_newlines_with_spaces(font->Version);
#ifdef DEBUG_TRUETYPE
@@ -322,7 +322,7 @@ void Read_name(struct TTFONT *font)
free(font->PostName);
font->PostName = (char*)calloc(sizeof(char),length+1);
strncpy(font->PostName,(const char*)strings+offset,length);
- font->PostName[length]=(char)NULL;
+ font->PostName[length]='\0';
replace_newlines_with_spaces(font->PostName);
#ifdef DEBUG_TRUETYPE
@@ -337,7 +337,7 @@ void Read_name(struct TTFONT *font)
free(font->PostName);
font->PostName = (char*)calloc(sizeof(char),length+1);
utf16be_to_ascii(font->PostName, (char *)strings+offset, length);
- font->PostName[length/2]=(char)NULL;
+ font->PostName[length/2]='\0';
replace_newlines_with_spaces(font->PostName);
#ifdef DEBUG_TRUETYPE
@@ -352,7 +352,7 @@ void Read_name(struct TTFONT *font)
{
font->Trademark = (char*)calloc(sizeof(char),length+1);
strncpy(font->Trademark,(const char*)strings+offset,length);
- font->Trademark[length]=(char)NULL;
+ font->Trademark[length]='\0';
replace_newlines_with_spaces(font->Trademark);
#ifdef DEBUG_TRUETYPE
@@ -1038,7 +1038,7 @@ const char *ttfont_CharStrings_getname(struct TTFONT *
}
strncpy(temp,ptr,len); /* Copy the pascal string into */
- temp[len]=(char)NULL; /* a buffer and make it ASCIIz. */
+ temp[len]='\0'; /* a buffer and make it ASCIIz. */
return temp;
}

22
graphics/py-matplotlib/patches/patch-lib_matplotlib_sphinxext_tests_test_tinypages_py
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-lib_matplotlib_sphinxext_tests_test_tinypages_py,v 1.2 2018/10/29 00:28:50 daniel Exp $
Index: lib/matplotlib/sphinxext/tests/test_tinypages.py
--- lib/matplotlib/sphinxext/tests/test_tinypages.py.orig
+++ lib/matplotlib/sphinxext/tests/test_tinypages.py
@@ -17,7 +17,7 @@ TINY_PAGES = pjoin(HERE, 'tinypages')
def setup():
# Check we have the sphinx-build command
try:
- ret = call(['sphinx-build', '--help'], stdout=PIPE, stderr=PIPE)
+ ret = call(['sphinx-build${MODPY_BIN_SUFFIX}', '--help'], stdout=PIPE, stderr=PIPE)
except OSError:
raise SkipTest('Need sphinx-build on path for these tests')
if ret != 0:
@@ -42,7 +42,7 @@ class TestTinyPages(object):
cls.html_dir = pjoin(cls.page_build, 'html')
cls.doctree_dir = pjoin(cls.page_build, 'doctrees')
# Build the pages with warnings turned into errors
- cmd = [str('sphinx-build'), '-W', '-b', 'html',
+ cmd = [str('sphinx-build${MODPY_BIN_SUFFIX}'), '-W', '-b', 'html',
'-d', cls.doctree_dir,
TINY_PAGES,
cls.html_dir]

6
graphics/py-matplotlib/patches/patch-setupext_py
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-setupext_py,v 1.17 2018/10/29 00:28:50 daniel Exp $
$OpenBSD: patch-setupext_py,v 1.18 2019/05/01 11:38:52 bket Exp $
Index: setupext.py
--- setupext.py.orig
+++ setupext.py
@@ -1547,6 +1547,7 @@ class BackendTkAgg(OptionalBackendPackage):
@@ -1487,6 +1487,7 @@ class BackendTkAgg(OptionalBackendPackage):
]
ext = make_extension('matplotlib.backends._tkagg', sources)
+ ext.include_dirs.extend(['${X11BASE}/include'])
self.add_flags(ext)
Numpy().add_flags(ext)
LibAgg().add_flags(ext, add_sources=False)
return ext

41
graphics/py-matplotlib/patches/patch-src__image_wrapper_cpp
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-src__image_wrapper_cpp,v 1.1 2018/11/02 23:32:44 daniel Exp $
Backport commit 7111817 to fix the build with clang on i386.
This is PR #10698
Index: src/_image_wrapper.cpp
--- src/_image_wrapper.cpp.orig
+++ src/_image_wrapper.cpp
@@ -360,13 +360,12 @@ static PyObject *image_pcolor(PyObject *self, PyObject
numpy::array_view<const float, 1> x;
numpy::array_view<const float, 1> y;
numpy::array_view<const agg::int8u, 3> d;
- unsigned int rows;
- unsigned int cols;
+ npy_intp rows, cols;
float bounds[4];
int interpolation;
if (!PyArg_ParseTuple(args,
- "O&O&O&II(ffff)i:pcolor",
+ "O&O&O&nn(ffff)i:pcolor",
&x.converter,
&x,
&y.converter,
@@ -404,13 +403,12 @@ static PyObject *image_pcolor2(PyObject *self, PyObjec
numpy::array_view<const double, 1> x;
numpy::array_view<const double, 1> y;
numpy::array_view<const agg::int8u, 3> d;
- unsigned int rows;
- unsigned int cols;
+ npy_intp rows, cols;
float bounds[4];
numpy::array_view<const agg::int8u, 1> bg;
if (!PyArg_ParseTuple(args,
- "O&O&O&II(ffff)O&:pcolor2",
+ "O&O&O&nn(ffff)O&:pcolor2",
&x.converter_contiguous,
&x,
&y.converter_contiguous,

1209
graphics/py-matplotlib/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff