pkgsrc-WIP-changes archive

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

py-qwt-qt5: imported to pkgsrc proper



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 30 10:25:25 2020 +0200
Changeset:	3c70d58e313f60526f8b15e15d45c0a8582d97bc

Modified Files:
	Makefile
Removed Files:
	py-qwt-qt5/DESCR
	py-qwt-qt5/Makefile
	py-qwt-qt5/PLIST
	py-qwt-qt5/distinfo
	py-qwt-qt5/patches/patch-mk__distinfo.py
	py-qwt-qt5/patches/patch-sip_qwt.sip
	py-qwt-qt5/patches/patch-sip_qwt__transform.sip

Log Message:
py-qwt-qt5: imported to pkgsrc proper

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3c70d58e313f60526f8b15e15d45c0a8582d97bc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                        |  1 -
 py-qwt-qt5/DESCR                                |  6 --
 py-qwt-qt5/Makefile                             | 44 ---------------
 py-qwt-qt5/PLIST                                | 74 -------------------------
 py-qwt-qt5/distinfo                             |  9 ---
 py-qwt-qt5/patches/patch-mk__distinfo.py        | 18 ------
 py-qwt-qt5/patches/patch-sip_qwt.sip            | 19 -------
 py-qwt-qt5/patches/patch-sip_qwt__transform.sip | 13 -----
 8 files changed, 184 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index f26f13143b..2c8d1b1b37 100644
--- a/Makefile
+++ b/Makefile
@@ -3891,7 +3891,6 @@ SUBDIR+=	py-quaternions
 SUBDIR+=	py-quepy
 SUBDIR+=	py-qutip
 SUBDIR+=	py-qutrub
-SUBDIR+=	py-qwt-qt5
 SUBDIR+=	py-radontea
 SUBDIR+=	py-rainbownum
 SUBDIR+=	py-ranger
diff --git a/py-qwt-qt5/DESCR b/py-qwt-qt5/DESCR
deleted file mode 100644
index bdd1420de8..0000000000
--- a/py-qwt-qt5/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Python PyQt wrapper for Qwt6
-
-The code is tested for python2/3 and Qt4/5. oscilloscope.py is
-unfinished. animation.py works only for qt5. All the other examples
-have been tested to work on Debian Linux. The qwt include files must
-be patched to build PyQt-Qwt.
diff --git a/py-qwt-qt5/Makefile b/py-qwt-qt5/Makefile
deleted file mode 100644
index 86847c23bf..0000000000
--- a/py-qwt-qt5/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD$
-
-VERSION=	1.02.00
-DISTNAME=	pyqt-qwt-${VERSION}
-PKGNAME=	${PYPKGPREFIX}-qwt-qt5-${DISTNAME:S/pyqt-qwt-//}
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GITHUB:=GauiStori/}
-GITHUB_PROJECT=	PyQt-Qwt
-GITHUB_TAG=	pyqt-qwt-${VERSION}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/GauiStori/PyQt-Qwt/
-COMMENT=	Python PyQt wrapper for Qwt6
-#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
-INSTALL_ENV+=	INSTALL_ROOT=${DESTDIR}
-ALL_ENV+=	LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/${BUILDLINK_LIBDIRS.qwt6-qt5}
-USE_LANGUAGES=	c++
-
-PY_PATCHPLIST=	yes
-
-do-configure:
-	set -e; cd ${WRKSRC};						\
-	  ${PKGSRC_SETENV} ${CONFIGURE_ENV}				\
-	  ${PYTHONBIN} configure.py					\
-	  --qwt-incdir=${PREFIX}/${BUILDLINK_INCDIRS.qwt6-qt5}		\
-	  --qwt-libdir=${PREFIX}/${BUILDLINK_LIBDIRS.qwt6-qt5}		\
-	  --qwt-lib=qwt							\
-	  --sip=${PREFIX}/bin/sip${PYVERSSUFFIX}			\
-	  --qmake=${PREFIX}/qt5/bin/qmake				\
-	  --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5	\
-	  --verbose
-
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/qwt6-qt5/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-qwt-qt5/PLIST b/py-qwt-qt5/PLIST
deleted file mode 100644
index 6e7460274c..0000000000
--- a/py-qwt-qt5/PLIST
+++ /dev/null
@@ -1,74 +0,0 @@
-@comment $NetBSD$
-${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
-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
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_slider.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_analog_clock.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_color_map.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_column_symbol.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_compass.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_compass_rose.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_counter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_curve_fitter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_dial.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_dial_needle.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_event_pattern.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_graphic.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_interval.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_knob.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_legend.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_legend_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_null_paintdevice.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_panner.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_picker.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_picker_machine.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_abstract_barchart.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_barchart.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_canvas.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_curve.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_dict.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_directpainter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_grid.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_histogram.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_item.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_layout.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_marker.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_multi_barchart.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_panner.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_picker.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_rasteritem.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_renderer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_seriesitem.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_spectrogram.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_zoomer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_point_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_point_polar.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_raster_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_round_scale_draw.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_samples.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_sampling_thread.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_div.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_draw.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_engine.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_map.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_widget.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_series_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_series_store.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_slider.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_spline.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_symbol.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_text.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_text_engine.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_text_label.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_thermo.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_transform.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_wheel.sip
diff --git a/py-qwt-qt5/distinfo b/py-qwt-qt5/distinfo
deleted file mode 100644
index 235d4aaa9d..0000000000
--- a/py-qwt-qt5/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-SHA1 (pyqt-qwt-1.02.00.tar.gz) = d1c113c5c8ae504bfc479dafdad94a2e459ecf09
-RMD160 (pyqt-qwt-1.02.00.tar.gz) = a25d19cd71baf264b03c02ecd2c86dd4fb3b560c
-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
diff --git a/py-qwt-qt5/patches/patch-mk__distinfo.py b/py-qwt-qt5/patches/patch-mk__distinfo.py
deleted file mode 100644
index 495f678a47..0000000000
--- a/py-qwt-qt5/patches/patch-mk__distinfo.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Work around DESTDIR installation issue
-
---- mk_distinfo.py.orig	2019-02-23 12:55:34.000000000 +0000
-+++ mk_distinfo.py
-@@ -98,6 +98,11 @@ for name in installed:
-         else:
-             fn_name = fn
- 
-+        if (fn.startswith(sys.prefix + "/")):
-+            fn = os.environ.get("DESTDIR") + fn
-+        if (os.path.isdir(fn)):
-+            continue
-+
-         fn_f = open(fn, 'rb')
-         data = fn_f.read()
-         fn_f.close()
diff --git a/py-qwt-qt5/patches/patch-sip_qwt.sip b/py-qwt-qt5/patches/patch-sip_qwt.sip
deleted file mode 100644
index 86e6590bf3..0000000000
--- a/py-qwt-qt5/patches/patch-sip_qwt.sip
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-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 --git a/py-qwt-qt5/patches/patch-sip_qwt__transform.sip b/py-qwt-qt5/patches/patch-sip_qwt__transform.sip
deleted file mode 100644
index 9526123a22..0000000000
--- a/py-qwt-qt5/patches/patch-sip_qwt__transform.sip
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-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