pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/py-qwt-qt5 py-qwt-qt5: updated to 1.02.02



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fb88a957771
branches:  trunk
changeset: 386425:5fb88a957771
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Oct 08 13:26:55 2022 +0000

description:
py-qwt-qt5: updated to 1.02.02

Version 1.02.01
- Fix compilation with sip5
- Minor bugfixes in examples

Version 1.02.02
- sip-tool compilation added.

diffstat:

 x11/py-qwt-qt5/Makefile                             |  20 ++++++++------------
 x11/py-qwt-qt5/PLIST                                |  11 ++++++-----
 x11/py-qwt-qt5/distinfo                             |  11 ++++-------
 x11/py-qwt-qt5/patches/patch-sip_qwt.sip            |  19 -------------------
 x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip |  13 -------------
 5 files changed, 18 insertions(+), 56 deletions(-)

diffs (132 lines):

diff -r ddf671b0e4e4 -r 5fb88a957771 x11/py-qwt-qt5/Makefile
--- a/x11/py-qwt-qt5/Makefile   Sat Oct 08 13:25:34 2022 +0000
+++ b/x11/py-qwt-qt5/Makefile   Sat Oct 08 13:26:55 2022 +0000
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.6 2022/05/14 17:00:25 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/10/08 13:26:55 adam Exp $
 
-VERSION=       1.02.00
+VERSION=       1.02.02
 DISTNAME=      pyqt-qwt-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-qwt-qt5-${DISTNAME:S/pyqt-qwt-//}
-PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GauiStori/}
 GITHUB_PROJECT=        PyQt-Qwt
-GITHUB_TAG=    pyqt-qwt-${VERSION}
+GITHUB_TAG=    v${VERSION}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/GauiStori/PyQt-Qwt/
+HOMEPAGE=      https://github.com/GauiStori/PyQt-Qwt
 COMMENT=       Python PyQt wrapper for Qwt6
-#LICENSE=      # gnu-lgpl-v2.1 with exception (Qwt License)
+LICENSE=       gnu-lgpl-v2.1 # with exception (Qwt License)
 
 BUILD_DEPENDS+=        qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
 
-WRKSRC=                ${WRKDIR}/PyQt-Qwt-pyqt-qwt-${VERSION}
-
 CONFIGURE_ENV+=        QT_SELECT=qt5
-MAKE_ENV+=     PATH=${PATH}:${PREFIX}/qt5/bin
+MAKE_ENV+=     PATH=${PATH:Q}:${PREFIX}/qt5/bin
 INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR}
 ALL_ENV+=      LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/${BUILDLINK_LIBDIRS.qwt6-qt5}
 USE_LANGUAGES= c++
@@ -36,7 +33,7 @@
          --sip=${PREFIX}/bin/sip${PYVERSSUFFIX}                        \
          --qmake=${PREFIX}/qt5/bin/qmake                               \
          --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5        \
-         --verbose
+         --no-qwt-api --verbose
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,8 +41,7 @@
 # clang: error: invalid argument '-bundle' not allowed with '-dynamiclib'
 BUILDLINK_TRANSFORM+=  rm:-bundle
 post-install:
-       install_name_tool       \
-               -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so \
+       install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so       \
          ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so
 .endif
 
diff -r ddf671b0e4e4 -r 5fb88a957771 x11/py-qwt-qt5/PLIST
--- a/x11/py-qwt-qt5/PLIST      Sat Oct 08 13:25:34 2022 +0000
+++ b/x11/py-qwt-qt5/PLIST      Sat Oct 08 13:26:55 2022 +0000
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2020/08/30 08:21:15 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/10/08 13:26:55 adam Exp $
 ${PYSITELIB}/PyQt5/Qwt.pyi
 ${PYSITELIB}/PyQt5/Qwt.so
-${PYSITELIB}/Qwt-6.1.2.dist-info/INSTALLER
-${PYSITELIB}/Qwt-6.1.2.dist-info/METADATA
-${PYSITELIB}/Qwt-6.1.2.dist-info/RECORD
+${PYSITELIB}/Qwt-1.02.02.dist-info/INSTALLER
+${PYSITELIB}/Qwt-1.02.02.dist-info/METADATA
+${PYSITELIB}/Qwt-1.02.02.dist-info/RECORD
+share/sip${PYVERSSUFFIX}/PyQt5/Qwt/Qwt_Qt4.sip
+share/sip${PYVERSSUFFIX}/PyQt5/Qwt/Qwt_Qt5.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qwt/conversions.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qmap_convert.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_legend.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_scale.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_scale_draw.sip
diff -r ddf671b0e4e4 -r 5fb88a957771 x11/py-qwt-qt5/distinfo
--- a/x11/py-qwt-qt5/distinfo   Sat Oct 08 13:25:34 2022 +0000
+++ b/x11/py-qwt-qt5/distinfo   Sat Oct 08 13:26:55 2022 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:34:20 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/10/08 13:26:55 adam Exp $
 
-BLAKE2s (pyqt-qwt-1.02.00.tar.gz) = 76f50d292845e1a6621cb414891da16bdbb7e77e512d9fa47690be85ad027181
-SHA512 (pyqt-qwt-1.02.00.tar.gz) = f2b54bd4097b726bcf4df897b910d49489efd2bc9d06d239037b0ecb7ed1420c76499e65b84a49efe2e8ba2313857ece92d8d50d157ccc38fda0cc0dac5ab178
-Size (pyqt-qwt-1.02.00.tar.gz) = 103588 bytes
-SHA1 (patch-mk__distinfo.py) = 180ce6d00f21142878f2a01805921d5c1fd63637
-SHA1 (patch-sip_qwt.sip) = f2491af157af22410ac78f1fb8bf05b332feb58e
-SHA1 (patch-sip_qwt__transform.sip) = 1e6f0e26e5cd5368bf39ce8ade529fef8464e34a
+BLAKE2s (pyqt-qwt-1.02.02.tar.gz) = 70ec253f564f0cbae48901c16a3a89b1c09d797a902cc38f94d8262f3f8736f9
+SHA512 (pyqt-qwt-1.02.02.tar.gz) = 2892827fb7e4e71c0f770ba481ef4653f2ef09a68767c178e4f810bb9c2f1e80362c7a37867c9b5d3525aed8118aef6c503ddc28323db02fe159055efed2a71d
+Size (pyqt-qwt-1.02.02.tar.gz) = 120948 bytes
diff -r ddf671b0e4e4 -r 5fb88a957771 x11/py-qwt-qt5/patches/patch-sip_qwt.sip
--- a/x11/py-qwt-qt5/patches/patch-sip_qwt.sip  Sat Oct 08 13:25:34 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-sip_qwt.sip,v 1.1 2020/08/30 08:21:15 tnn Exp $
-
-sip: sip/qwt.sip:13: syntax error
-Error: Unable to create the C++ code.
-*** Error code 1
-
-Hint:
-  http://gnats.netbsd.org/54558
-
---- sip/qwt.sip.orig   2019-02-23 12:55:34.000000000 +0000
-+++ sip/qwt.sip
-@@ -10,7 +10,6 @@
- %Module(name=Qwt, keyword_arguments="Optional")
- 
- %Import QtCore/QtCoremod.sip
--typedef unsigned long size_t;
- %Import QtGui/QtGuimod.sip
- 
- %If (Qt_5_0_0 -)
diff -r ddf671b0e4e4 -r 5fb88a957771 x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip
--- a/x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip       Sat Oct 08 13:25:34 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-sip_qwt__transform.sip,v 1.1 2020/08/30 08:21:15 tnn Exp $
-
-https://github.com/GauiStori/PyQt-Qwt/commit/8f6e01a10f29417214ae2266f3e5c13443e989a0
-
---- sip/qwt_transform.sip.orig 2019-02-23 12:55:34.000000000 +0000
-+++ sip/qwt_transform.sip
-@@ -123,4 +123,6 @@ public:
- 
-     virtual QwtTransform *copy() const;
- 
-+private:
-+    QwtPowerTransform& operator=(const QwtPowerTransform&);
- };



Home | Main Index | Thread Index | Old Index