Received: by mail.netbsd.org (Postfix, from userid 605) id 1500D84DDA; Sun, 21 Jun 2020 00:30:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9125B84D88 for ; Sun, 21 Jun 2020 00:30:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id t8C1LooccCbN for ; Sun, 21 Jun 2020 00:30:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0755484D75 for ; Sun, 21 Jun 2020 00:30:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 010DFFB28; Sun, 21 Jun 2020 00:30:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592699404296040" MIME-Version: 1.0 Date: Sun, 21 Jun 2020 00:30:04 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/geography/qgis To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200621003005.010DFFB28@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. --_----------=_1592699404296040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Sun Jun 21 00:30:04 UTC 2020 Modified Files: pkgsrc/geography/qgis: distinfo Added Files: pkgsrc/geography/qgis/patches: patch-python_core_conversions.sip Log Message: geography/qgis: Work around a py-sip upgrade Patch from upstream. Does not yet build, but gets to the next error now. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/geography/qgis/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/geography/qgis/patches/patch-python_core_conversions.sip Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1592699404296040 Content-Disposition: inline Content-Length: 3672 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/qgis/distinfo diff -u pkgsrc/geography/qgis/distinfo:1.15 pkgsrc/geography/qgis/distinfo:1.16 --- pkgsrc/geography/qgis/distinfo:1.15 Sat Jun 20 17:52:05 2020 +++ pkgsrc/geography/qgis/distinfo Sun Jun 21 00:30:04 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2020/06/20 17:52:05 gdt Exp $ +$NetBSD: distinfo,v 1.16 2020/06/21 00:30:04 gdt Exp $ SHA1 (qgis-3.8.3.tar.bz2) = 4ac18e9818e86433901158185e2c807cf418a043 RMD160 (qgis-3.8.3.tar.bz2) = dd90e89d522924cedb5152826eae426ad7aa1754 @@ -7,6 +7,7 @@ Size (qgis-3.8.3.tar.bz2) = 82720462 byt SHA1 (patch-cmake_FindQwt.cmake) = bd0c082e53b8647fcdeb671b932180ec16de49d9 SHA1 (patch-mac_CMakeLists.txt) = 2468c0a629738ce78cccb784395eb1f41049cc73 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6 +SHA1 (patch-python_core_conversions.sip) = 41df73f8438569392f2158d83c89e86ae8024319 SHA1 (patch-src_analysis_interpolation_qgsinterpolator.h) = 13e48b38dbe2c2e3a134da7d551a81067ffe25bd SHA1 (patch-src_core_CMakeLists.txt) = f476770fcb488385723def8aecaa8146de18d624 SHA1 (patch-src_core_dxf_qgsdxfpaintengine.h) = 1c574fa457bb9fbbf3fc5421dd806875a883c518 Added files: Index: pkgsrc/geography/qgis/patches/patch-python_core_conversions.sip diff -u /dev/null pkgsrc/geography/qgis/patches/patch-python_core_conversions.sip:1.1 --- /dev/null Sun Jun 21 00:30:04 2020 +++ pkgsrc/geography/qgis/patches/patch-python_core_conversions.sip Sun Jun 21 00:30:04 2020 @@ -0,0 +1,88 @@ +$NetBSD: patch-python_core_conversions.sip,v 1.1 2020/06/21 00:30:04 gdt Exp $ + +Accomodate sip 4.19.23 and qt 5.15 +From +https://git.archlinux.org/svntogit/community.git/plain/trunk/qgis-pyqt-5.15.patch?h=packages/qgis&id=fef9f4c085355242e6455de901813e838cc24fd6 + +--- python/core/conversions.sip.orig 2019-09-13 12:11:09.000000000 +0000 ++++ python/core/conversions.sip +@@ -1435,79 +1435,6 @@ template + %End + }; + +-template +-%MappedType QVector< TYPE* > +-{ +-%TypeHeaderCode +-#include +-%End +- +-%ConvertFromTypeCode +- // Create the list +- PyObject *l = PyList_New(sipCpp->size()); +- +- if (!l) +- return NULL; +- +- // Set the dictionary elements. +- for( int i = 0; i < sipCpp->size(); i++ ) +- { +- TYPE *t = sipCpp->at(i); +- PyObject *tobj = sipConvertFromType(t, sipType_TYPE, sipTransferObj); +- +- if (tobj == NULL || PyList_SetItem(l, i, tobj) < 0) +- { +- Py_DECREF(tobj); +- Py_DECREF(l); +- return NULL; +- } +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- { +- if (!PyList_Check(sipPy)) +- return 0; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, SIP_NOT_NONE)) +- return 0; +- } +- +- return 1; +- } +- +- QVector *v = new QVector( PyList_GET_SIZE(sipPy) ); +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- int state; +- +- TYPE *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); +- +- if (*sipIsErr) +- { +- sipReleaseType(t, sipType_TYPE, state); +- delete v; +- return 0; +- } +- +- v->replace( i, t ); +- +- sipReleaseType(t, sipType_TYPE, state); +- } +- +- *sipCppPtr = v; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- + %MappedType QMap + { + %TypeHeaderCode --_----------=_1592699404296040--