Received: by mail.netbsd.org (Postfix, from userid 605) id DBFEB84DF8; Sun, 30 Aug 2020 08:05:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 62F7584DF3 for ; Sun, 30 Aug 2020 08:05:58 +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 qHC3kx7tS7C1 for ; Sun, 30 Aug 2020 08:05:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7ED2984D61 for ; Sun, 30 Aug 2020 08:05:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 717B5FB27; Sun, 30 Aug 2020 08:05:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159877475753010" MIME-Version: 1.0 Date: Sun, 30 Aug 2020 08:05:57 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/x11/qwt6-qt5 To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200830080557.717B5FB27@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. --_----------=_159877475753010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Aug 30 08:05:57 UTC 2020 Modified Files: pkgsrc/x11/qwt6-qt5: Makefile PLIST buildlink3.mk distinfo Added Files: pkgsrc/x11/qwt6-qt5/patches: patch-qwtconfig.pri Removed Files: pkgsrc/x11/qwt6-qt5/patches: patch-pri patch-src_qwt__dial.h patch-src_qwt__global.h patch-src_qwt__null__paintdevice.cpp patch-src_qwt__painter.h patch-src_qwt__painter__command.h patch-src_qwt__scale__draw.cpp Log Message: qwt6-qt5: update to 6.1.5 Maintenance - Avoid using some of the deprecated Qt APIs - Missing includes of QPainterPath ( Qt 5.15 ) added - QwtPlotSpectroCurve: missing public inheritance - QwtPlotTradingCurve: missing public inheritance Bug fixes - QwtLinearColorMap: handling of alpha values in color stops fixed - QwtPlotRasterItem: missing color table initialization for QImage::Format_Indexed8 - QwtScaleWidget: missing QEvent::LayoutRequest added - QwtSetSample: bound rectangle fixed for empty sets To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/qwt6-qt5/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qwt6-qt5/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/qwt6-qt5/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qwt6-qt5/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/x11/qwt6-qt5/patches/patch-pri \ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__dial.h \ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__global.h \ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__null__paintdevice.cpp \ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter.h \ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__painter__command.h \ pkgsrc/x11/qwt6-qt5/patches/patch-src_qwt__scale__draw.cpp cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159877475753010 Content-Disposition: inline Content-Length: 7151 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qwt6-qt5/Makefile diff -u pkgsrc/x11/qwt6-qt5/Makefile:1.10 pkgsrc/x11/qwt6-qt5/Makefile:1.11 --- pkgsrc/x11/qwt6-qt5/Makefile:1.10 Tue Aug 18 17:58:18 2020 +++ pkgsrc/x11/qwt6-qt5/Makefile Sun Aug 30 08:05:57 2020 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2020/08/18 17:58:18 leot Exp $ +# $NetBSD: Makefile,v 1.11 2020/08/30 08:05:57 tnn Exp $ -DISTNAME= qwt-6.1.4 -PKGNAME= qwt6-qt5-6.1.4 -PKGREVISION= 7 +DISTNAME= qwt-6.1.5 +PKGNAME= qwt6-qt5-6.1.5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/} EXTRACT_SUFX= .tar.bz2 @@ -22,6 +21,11 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DEST PLIST_SUBST+= VERSION=${PKGVERSION_NOREV} +# remove tex temp files that should not be installed +post-extract: + rm -f ${WRKSRC}/doc/html/_form* + rm -f ${WRKSRC}/doc/html/functions_*~.html + do-configure: cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake Index: pkgsrc/x11/qwt6-qt5/PLIST diff -u pkgsrc/x11/qwt6-qt5/PLIST:1.1 pkgsrc/x11/qwt6-qt5/PLIST:1.2 --- pkgsrc/x11/qwt6-qt5/PLIST:1.1 Mon Oct 28 19:00:37 2019 +++ pkgsrc/x11/qwt6-qt5/PLIST Sun Aug 30 08:05:57 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2019/10/28 19:00:37 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/08/30 08:05:57 tnn Exp $ qt5/plugins/designer/libqwt_designer_plugin.so qwt-${VERSION}/doc/html/analogclock.png qwt-${VERSION}/doc/html/annotated.html @@ -749,17 +749,9 @@ qwt-${VERSION}/doc/html/doxygen.png qwt-${VERSION}/doc/html/dynsections.js qwt-${VERSION}/doc/html/folderclosed.png qwt-${VERSION}/doc/html/folderopen.png -qwt-${VERSION}/doc/html/form_0.png -qwt-${VERSION}/doc/html/form_1.png -qwt-${VERSION}/doc/html/form_2.png -qwt-${VERSION}/doc/html/form_3.png -qwt-${VERSION}/doc/html/form_4.png -qwt-${VERSION}/doc/html/form_5.png -qwt-${VERSION}/doc/html/formula.repository qwt-${VERSION}/doc/html/friedberg-bars-600x400.png qwt-${VERSION}/doc/html/friedberg-tube-600x400.png qwt-${VERSION}/doc/html/functions.html -qwt-${VERSION}/doc/html/functions_0x7e.html qwt-${VERSION}/doc/html/functions_b.html qwt-${VERSION}/doc/html/functions_c.html qwt-${VERSION}/doc/html/functions_d.html @@ -794,7 +786,6 @@ qwt-${VERSION}/doc/html/functions_eval_y qwt-${VERSION}/doc/html/functions_f.html qwt-${VERSION}/doc/html/functions_func.html qwt-${VERSION}/doc/html/functions_func.js -qwt-${VERSION}/doc/html/functions_func_0x7e.html qwt-${VERSION}/doc/html/functions_func_b.html qwt-${VERSION}/doc/html/functions_func_c.html qwt-${VERSION}/doc/html/functions_func_d.html @@ -1661,4 +1652,4 @@ qwt-${VERSION}/include/qwt_widget_overla qwt-${VERSION}/lib/libqwt.so qwt-${VERSION}/lib/libqwt.so.6 qwt-${VERSION}/lib/libqwt.so.6.1 -qwt-${VERSION}/lib/libqwt.so.6.1.4 +qwt-${VERSION}/lib/libqwt.so.6.1.5 Index: pkgsrc/x11/qwt6-qt5/buildlink3.mk diff -u pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.9 pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.10 --- pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.9 Mon Aug 17 20:18:00 2020 +++ pkgsrc/x11/qwt6-qt5/buildlink3.mk Sun Aug 30 08:05:57 2020 @@ -1,18 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.9 2020/08/17 20:18:00 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2020/08/30 08:05:57 tnn Exp $ BUILDLINK_TREE+= qwt6-qt5 .if !defined(QWT6_QT5_BUILDLINK3_MK) QWT6_QT5_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.4 -BUILDLINK_ABI_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.4nb6 +BUILDLINK_API_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.5 BUILDLINK_PKGSRCDIR.qwt6-qt5?= ../../x11/qwt6-qt5 -QWT_DIR= ${BUILDLINK_PREFIX.qwt6-qt5}/qwt-6.1.4 -BUILDLINK_INCDIRS.qwt6-qt5+= qwt-6.1.4/include -BUILDLINK_LIBDIRS.qwt6-qt5+= qwt-6.1.4/lib -BUILDLINK_RPATHDIRS.qwt6-qt5+= qwt-6.1.4/lib +QWT_DIR= ${BUILDLINK_PREFIX.qwt6-qt5}/qwt-6.1.5 +BUILDLINK_INCDIRS.qwt6-qt5+= qwt-6.1.5/include +BUILDLINK_LIBDIRS.qwt6-qt5+= qwt-6.1.5/lib +BUILDLINK_RPATHDIRS.qwt6-qt5+= qwt-6.1.5/lib .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" Index: pkgsrc/x11/qwt6-qt5/distinfo diff -u pkgsrc/x11/qwt6-qt5/distinfo:1.2 pkgsrc/x11/qwt6-qt5/distinfo:1.3 --- pkgsrc/x11/qwt6-qt5/distinfo:1.2 Tue Jun 9 07:01:55 2020 +++ pkgsrc/x11/qwt6-qt5/distinfo Sun Aug 30 08:05:57 2020 @@ -1,14 +1,8 @@ -$NetBSD: distinfo,v 1.2 2020/06/09 07:01:55 mef Exp $ +$NetBSD: distinfo,v 1.3 2020/08/30 08:05:57 tnn Exp $ -SHA1 (qwt-6.1.4.tar.bz2) = a1028cb0a33322920266fb183869023b8ed30394 -RMD160 (qwt-6.1.4.tar.bz2) = a78f245b430b3e97443245d336031be59e2b0e17 -SHA512 (qwt-6.1.4.tar.bz2) = 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da -Size (qwt-6.1.4.tar.bz2) = 4227315 bytes -SHA1 (patch-pri) = ae8ca6197b76c082e22e4a9df57328ff8033d724 +SHA1 (qwt-6.1.5.tar.bz2) = 07c71427f1f4bbd0354b3a98965943ce2f220766 +RMD160 (qwt-6.1.5.tar.bz2) = 37bf5b741cbf9c760879b88cdfae741c0c6dc9ce +SHA512 (qwt-6.1.5.tar.bz2) = 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22 +Size (qwt-6.1.5.tar.bz2) = 4408268 bytes SHA1 (patch-qwt.prf) = f952dfc68909a24c847a8c33ea4b2cd21591fd31 -SHA1 (patch-src_qwt__dial.h) = 414509a26cf2db092881958a047291a14bc343a4 -SHA1 (patch-src_qwt__global.h) = 0624e0cdb8f3e30c34182969ef111c79da6fe128 -SHA1 (patch-src_qwt__null__paintdevice.cpp) = 7e0d8cdf2f22c565c69198128b8e0b74cc586ea2 -SHA1 (patch-src_qwt__painter.h) = f499a1316b6ffc584692b3d310483921ffe0c7e9 -SHA1 (patch-src_qwt__painter__command.h) = 27db14826ab80bf915031da7c6591a20715c3163 -SHA1 (patch-src_qwt__scale__draw.cpp) = ef8d66c0d86e6be825f7c592b081c2f28ec98508 +SHA1 (patch-qwtconfig.pri) = c1fae28cc33d35445c772f32da55ba20b20fe40a Added files: Index: pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri diff -u /dev/null pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri:1.1 --- /dev/null Sun Aug 30 08:05:57 2020 +++ pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri Sun Aug 30 08:05:57 2020 @@ -0,0 +1,32 @@ +$NetBSD: patch-qwtconfig.pri,v 1.1 2020/08/30 08:05:57 tnn Exp $ + +Don't hardcode PREFIX. + +--- qwtconfig.pri.orig 2019-01-02 17:21:31.556467499 +0100 ++++ qwtconfig.pri 2019-10-25 18:51:20.912266571 +0200 +@@ -19,7 +19,7 @@ + QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] + + unix { +- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION ++ QWT_INSTALL_PREFIX = $$(PREFIX)/qwt-$$QWT_VERSION + # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION + } + +@@ -42,14 +42,14 @@ + # runtime environment of designer/creator. + ###################################################################### + +-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer ++#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer + + # linux distributors often organize the Qt installation + # their way and QT_INSTALL_PREFIX doesn't offer a good + # path. Also QT_INSTALL_PREFIX is only one of the default + # search paths of the designer - not the Qt creator + +-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer ++QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer + + ###################################################################### + # Features --_----------=_159877475753010--