veusz update, unbreaks with sip update

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

veusz update, unbreaks with sip update

Stuart Henderson
Sorry I missed this when testing, I had a local update in my tree which is
why my SUBDIRLIST build of ports using sip/py-qt5 didn't notice it.
I tried some of the example documents and don't see any problems.
OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/veusz/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 4 Jan 2021 14:06:35 -0000 1.26
+++ Makefile 16 Feb 2021 15:37:07 -0000
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.26 2021/01/04 14:06:35 sthen Exp $
 
 COMMENT = scientific plotting and graphing package
-MODPY_EGG_VERSION = 3.2.1
+MODPY_EGG_VERSION = 3.3.1
 DISTNAME = veusz-${MODPY_EGG_VERSION}
 CATEGORIES = math graphics
-REVISION = 1
 
 HOMEPAGE = https://veusz.github.io/
 MAINTAINER = Brian Callahan <[hidden email]>
@@ -29,8 +28,6 @@ BUILD_DEPENDS = devel/py-sip${MODPY_FLAV
 RUN_DEPENDS = math/py-numpy${MODPY_FLAVOR} \
  x11/py-qt5${MODPY_FLAVOR}
 TEST_DEPENDS = ${BASE_PKGPATH}
-
-MAKE_ENV = SIP_DIR="${LOCALBASE}/share/sip/PyQt5${MODPY_BIN_SUFFIX}"
 
 do-test:
  cd ${WRKSRC}/tests && ${MODPY_BIN} runselftest.py
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/veusz/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 25 Mar 2020 20:03:50 -0000 1.16
+++ distinfo 16 Feb 2021 15:37:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (veusz-3.2.1.tar.gz) = nq+VoqjK4tMX5+5H5z9c9Y0ZGxbAUa4KHcOZ5vd1dQM=
-SIZE (veusz-3.2.1.tar.gz) = 2529051
+SHA256 (veusz-3.3.1.tar.gz) = 4ClgYwiU21wHDve2q9cItSAVb9hbR2F+fJc8znGI8OA=
+SIZE (veusz-3.3.1.tar.gz) = 3249376
Index: patches/patch-pyqtdistutils_py
===================================================================
RCS file: patches/patch-pyqtdistutils_py
diff -N patches/patch-pyqtdistutils_py
--- patches/patch-pyqtdistutils_py 16 Sep 2020 06:07:46 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-pyqtdistutils_py,v 1.3 2020/09/16 06:07:46 rsadowski Exp $
-
-Index: pyqtdistutils.py
---- pyqtdistutils.py.orig
-+++ pyqtdistutils.py
-@@ -307,7 +307,7 @@ class build_ext(distutils.command.build_ext.build_ext)
-                 sip_exe,
-                 '-c', self.build_temp
-             ] + SIP_FLAGS.split() + [
--                '-I', os.path.join(sip_dir, 'PyQt5'),
-+                '-I', sip_dir,
-                 '-b', sbf,
-                 source
-             ]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/veusz/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 4 Jan 2021 14:06:35 -0000 1.11
+++ pkg/PLIST 16 Feb 2021 15:37:07 -0000
@@ -173,6 +173,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/3d_points.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/3d_surface.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/3d_volume.vsz
+lib/python${MODPY_VERSION}/site-packages/veusz/examples/FDR_example.vsz
+lib/python${MODPY_VERSION}/site-packages/veusz/examples/FDR_sample_data.csv
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/axis_function.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/axis_function_linked.csv
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/axis_function_linked.vsz
@@ -202,6 +204,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/functions.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/hatching.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/histo.vsz
+lib/python${MODPY_VERSION}/site-packages/veusz/examples/histo_widget.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/histogramming.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/inside.vsz
 lib/python${MODPY_VERSION}/site-packages/veusz/examples/isolatedaxes.vsz
@@ -253,6 +256,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_graph.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_graph3d.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_grid.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_histo.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_image.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_imagefile.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_key.svg
@@ -278,6 +282,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_barcurve.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_bardiamond.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_barends.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_barendshi.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_barendslo.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_barhi.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_barlo.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_box.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_boxfill.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_curve.svg
@@ -288,8 +296,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_fillvert.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linehorz.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linehorzbar.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linehorzhi.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linehorzlo.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linevert.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linevertbar.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_lineverthi.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_linevertlo.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/error_none.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/kde-application-exit.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/kde-clipboard.svg
@@ -355,6 +367,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_plotline.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_plotmarkerfill.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_plotmarkerline.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_postline.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_stylesheet.png
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_subcontourline.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/settings_whisker.svg
@@ -365,7 +378,10 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-pick-data.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-shape-menu.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-view-fullscreen.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-zoom-graph-out.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-zoom-graph-recenter.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-zoom-graph.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz-zoom-reset.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz.png
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz.svg
 lib/python${MODPY_VERSION}/site-packages/veusz/icons/veusz_128.png
@@ -392,6 +408,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}clicklabel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}datasetbrowser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}historycheck.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}historycombo.${MODPY_PYC_MAGIC_TAG}pyc
@@ -400,6 +417,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}historyvaluecombo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}lineeditwithclear.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/${MODPY_PYCACHE}recentfilesbutton.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/clicklabel.py
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/datasetbrowser.py
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/historycheck.py
 lib/python${MODPY_VERSION}/site-packages/veusz/qtwidgets/historycombo.py
@@ -512,6 +530,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}graph3d.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}grid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}histo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}image.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}pyc
@@ -552,6 +571,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/graph.py
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/graph3d.py
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/grid.py
+lib/python${MODPY_VERSION}/site-packages/veusz/widgets/histo.py
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/image.py
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/key.py
 lib/python${MODPY_VERSION}/site-packages/veusz/widgets/line.py

Reply | Threaded
Open this post in threaded view
|

Re: veusz update, unbreaks with sip update

Brian Callahan-6
Hi Stuart --

On Tuesday, February 16th, 2021 at 10:41 AM, Stuart Henderson <[hidden email]> wrote:

> Sorry I missed this when testing, I had a local update in my tree which is
>
> why my SUBDIRLIST build of ports using sip/py-qt5 didn't notice it.
>
> I tried some of the example documents and don't see any problems.
>
> OK?
>

I get a build failure (log attached) with this. I did run pkg_add -u
to make sure I got the new py3-sip-5.5.0v0.

The main issue is:
pkg_resources.DistributionNotFound: The 'packaging' distribution was not found and is required by sip

Thanks.

~Brian

veusz.gz (3K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: veusz update, unbreaks with sip update

Stuart Henderson
On 2021/02/16 23:22, Brian Callahan wrote:

> Hi Stuart --
>
> On Tuesday, February 16th, 2021 at 10:41 AM, Stuart Henderson <[hidden email]> wrote:
>
> > Sorry I missed this when testing, I had a local update in my tree which is
> >
> > why my SUBDIRLIST build of ports using sip/py-qt5 didn't notice it.
> >
> > I tried some of the example documents and don't see any problems.
> >
> > OK?
> >
>
> I get a build failure (log attached) with this. I did run pkg_add -u
> to make sure I got the new py3-sip-5.5.0v0.
>
> The main issue is:
> pkg_resources.DistributionNotFound: The 'packaging' distribution was not found and is required by sip
>
> Thanks.
>
> ~Brian

Thanks, I've just added the missing dep to py-sip. It should work if you
pkg_add py3-packaging.

Reply | Threaded
Open this post in threaded view
|

Re: veusz update, unbreaks with sip update

Brian Callahan-6
On Tuesday, February 16th, 2021 at 6:34 PM, Stuart Henderson <[hidden email]> wrote:

> On 2021/02/16 23:22, Brian Callahan wrote:
>
> > Hi Stuart --
> >
> > On Tuesday, February 16th, 2021 at 10:41 AM, Stuart Henderson [hidden email] wrote:
> >
> > > Sorry I missed this when testing, I had a local update in my tree which is
> > >
> > > why my SUBDIRLIST build of ports using sip/py-qt5 didn't notice it.
> > >
> > > I tried some of the example documents and don't see any problems.
> > >
> > > OK?
> >
> > I get a build failure (log attached) with this. I did run pkg_add -u
> >
> > to make sure I got the new py3-sip-5.5.0v0.
> >
> > The main issue is:
> >
> > pkg_resources.DistributionNotFound: The 'packaging' distribution was not found and is required by sip
> >
> > Thanks.
> >
> > ~Brian
>
> Thanks, I've just added the missing dep to py-sip. It should work if you
>
> pkg_add py3-packaging.

Yup. All is good. OK and thanks.

~Brian