Received: by mail.netbsd.org (Postfix, from userid 605) id BA2C984D2D; Sun, 9 Aug 2020 19:11:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4382D84D28 for ; Sun, 9 Aug 2020 19:11:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ymzrPAEkJAni for ; Sun, 9 Aug 2020 19:11:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BF1F084CE8 for ; Sun, 9 Aug 2020 19:11:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B9620FB28; Sun, 9 Aug 2020 19:11:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1597000292188710" MIME-Version: 1.0 Date: Sun, 9 Aug 2020 19:11:32 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/math/py-pandas To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200809191132.B9620FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1597000292188710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sun Aug 9 19:11:32 UTC 2020 Modified Files: pkgsrc/math/py-pandas: distinfo Added Files: pkgsrc/math/py-pandas/patches: patch-pandas___libs_src_ujson_python_objToJSON.c Log Message: Fix build against numpy 1.19. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/math/py-pandas/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/math/py-pandas/patches/patch-pandas___libs_src_ujson_python_objToJSON.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1597000292188710 Content-Disposition: inline Content-Length: 1730 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/py-pandas/distinfo diff -u pkgsrc/math/py-pandas/distinfo:1.22 pkgsrc/math/py-pandas/distinfo:1.23 --- pkgsrc/math/py-pandas/distinfo:1.22 Fri Feb 14 16:21:55 2020 +++ pkgsrc/math/py-pandas/distinfo Sun Aug 9 19:11:32 2020 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.22 2020/02/14 16:21:55 minskim Exp $ +$NetBSD: distinfo,v 1.23 2020/08/09 19:11:32 joerg Exp $ SHA1 (pandas-0.25.3.tar.gz) = 4123c7452df2662a99ae70821c119f4035f217ba RMD160 (pandas-0.25.3.tar.gz) = cb526595c8b38bd4973a49ebebb61c165421628b SHA512 (pandas-0.25.3.tar.gz) = ab282e4d3145daafa68d5e3a2e82d692385eb62720d6503ddb3a4f76cf380591cbd32ba3e15fa5ba93725a221d3f74062012ca13a0df8e08c324e706ca35ccf6 Size (pandas-0.25.3.tar.gz) = 12632585 bytes +SHA1 (patch-pandas___libs_src_ujson_python_objToJSON.c) = 691a76fae9b28310d08db30c87213b0c5fbf0ad6 Added files: Index: pkgsrc/math/py-pandas/patches/patch-pandas___libs_src_ujson_python_objToJSON.c diff -u /dev/null pkgsrc/math/py-pandas/patches/patch-pandas___libs_src_ujson_python_objToJSON.c:1.1 --- /dev/null Sun Aug 9 19:11:32 2020 +++ pkgsrc/math/py-pandas/patches/patch-pandas___libs_src_ujson_python_objToJSON.c Sun Aug 9 19:11:32 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-pandas___libs_src_ujson_python_objToJSON.c,v 1.1 2020/08/09 19:11:32 joerg Exp $ + +Fix build with NumPy 1.19. + +--- pandas/_libs/src/ujson/python/objToJSON.c.orig 2019-10-31 20:16:52.000000000 +0000 ++++ pandas/_libs/src/ujson/python/objToJSON.c +@@ -178,7 +178,7 @@ void *initObjToJSON(void) + + /* Initialise numpy API and use 2/3 compatible return */ + import_array(); +- return NUMPY_IMPORT_ARRAY_RETVAL; ++ return NULL; + } + + static TypeContext *createTypeContext(void) { --_----------=_1597000292188710--