[pkgsrc/trunk]: pkgsrc Adjust to python-versioned py-qt5 and/or x11/py-qt5-qs...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Adjust to python-versioned py-qt5 and/or x11/py-qt5-qs...
From: rhialto <rhialto%pkgsrc.org@localhost>
Date: Mon, 06 Apr 2020 12:58:12 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c01bf9fe4b5e
branches:  trunk
changeset: 422411:c01bf9fe4b5e
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sun Jan 26 12:55:00 2020 +0000

description:
Adjust to python-versioned py-qt5 and/or x11/py-qt5-qscintilla files.

diffstat:

 finance/moneyguru/Makefile               |   8 +++++---
 finance/moneyguru/distinfo               |   4 +++-
 finance/moneyguru/patches/patch-Makefile |  15 +++++++++++++++
 finance/moneyguru/patches/patch-build.py |  19 +++++++++++++++++++
 geography/qgis/Makefile                  |  13 ++++++++++---
 sysutils/dupeguru/Makefile               |   8 +++++---
 sysutils/dupeguru/distinfo               |   4 +++-
 sysutils/dupeguru/patches/patch-Makefile |  15 +++++++++++++++
 sysutils/dupeguru/patches/patch-build.py |  16 ++++++++++++++++
 9 files changed, 91 insertions(+), 11 deletions(-)

diffs (196 lines):

diff -r f32a5c2a91b2 -r c01bf9fe4b5e finance/moneyguru/Makefile
--- a/finance/moneyguru/Makefile        Sun Jan 26 12:54:15 2020 +0000
+++ b/finance/moneyguru/Makefile        Sun Jan 26 12:55:00 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2019/11/02 16:08:47 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2020/01/26 12:55:00 rhialto Exp $
 
 DISTNAME=      moneyguru-src-2.11.0
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    finance
 MASTER_SITES=  https://download.hardcoded.net/
 
@@ -40,8 +40,10 @@
 
 PLIST_SUBST+=  BASE_ARCH=${BASE_ARCH:Q}
 
+MAKE_ENV+=     PYVERSSUFFIX=${PYVERSSUFFIX}
+
 do-build:
-       cd ${WRKSRC} && ${PYTHONBIN} build.py
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py
        ${CHMOD} +x ${WRKSRC}/run.py
 
 do-install:
diff -r f32a5c2a91b2 -r c01bf9fe4b5e finance/moneyguru/distinfo
--- a/finance/moneyguru/distinfo        Sun Jan 26 12:54:15 2020 +0000
+++ b/finance/moneyguru/distinfo        Sun Jan 26 12:55:00 2020 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/09/04 14:45:43 wiz Exp $
+$NetBSD: distinfo,v 1.11 2020/01/26 12:55:00 rhialto Exp $
 
 SHA1 (moneyguru-src-2.11.0.tar.gz) = f3c787c45f5057d8f348a0c37b2da010f4444057
 RMD160 (moneyguru-src-2.11.0.tar.gz) = 8e04b57bd3100ce28fb003c528000463f9d0eb87
 SHA512 (moneyguru-src-2.11.0.tar.gz) = fae1c8140ed36f3bd33a7533938ba59bffeda898932c005c5a5e115d6108dc43a6f53cc65608340fd5501945b13604d136b8ac083d2daa3876bdc070d619c022
 Size (moneyguru-src-2.11.0.tar.gz) = 2658749 bytes
+SHA1 (patch-Makefile) = 1dced1ca961e74e5adcb2f7013dee04efd78d44e
+SHA1 (patch-build.py) = e7084efd4ba8543c4fd5f93cddde7a840bf19d27
diff -r f32a5c2a91b2 -r c01bf9fe4b5e finance/moneyguru/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/finance/moneyguru/patches/patch-Makefile  Sun Jan 26 12:55:00 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/01/26 12:55:01 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- Makefile.orig      2017-08-23 23:26:50.000000000 +0000
++++ Makefile
+@@ -71,7 +71,7 @@ endif
+       $(VENV_PYTHON) build.py --doc
+ 
+ qt/mg_rc.py : qt/mg.qrc
+-      pyrcc5 qt/mg.qrc > qt/mg_rc.py
++      pyrcc5-${PYVERSSUFFIX} qt/mg.qrc > qt/mg_rc.py
+ 
+ i18n: $(mofiles)
+ 
diff -r f32a5c2a91b2 -r c01bf9fe4b5e finance/moneyguru/patches/patch-build.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/finance/moneyguru/patches/patch-build.py  Sun Jan 26 12:55:00 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-build.py,v 1.1 2020/01/26 12:55:01 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- build.py.orig      2017-08-23 23:26:50.000000000 +0000
++++ build.py
+@@ -81,9 +81,10 @@ def clean():
+ def build_qt(dev):
+     qrc_path = op.join('qt', 'mg.qrc')
+     pyrc_path = op.join('qt', 'mg_rc.py')
+-    ret = print_and_do("pyrcc5 {} > {}".format(qrc_path, pyrc_path))
++    pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"]
++    ret = print_and_do(pyrcc5 +" {} > {}".format(qrc_path, pyrc_path))
+     if ret != 0:
+-        raise RuntimeError("pyrcc5 call failed with code {}. Aborting build".format(ret))
++        raise RuntimeError(pyrcc5 + " call failed with code {}. Aborting build".format(ret))
+     build_help()
+ 
+ def build_help():
diff -r f32a5c2a91b2 -r c01bf9fe4b5e geography/qgis/Makefile
--- a/geography/qgis/Makefile   Sun Jan 26 12:54:15 2020 +0000
+++ b/geography/qgis/Makefile   Sun Jan 26 12:55:00 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2020/01/18 21:49:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2020/01/26 12:55:01 rhialto Exp $
 
 DISTNAME=      qgis-3.8.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2
@@ -36,11 +36,18 @@
 SUBST_STAGE.xapple=            pre-configure
 SUBST_MESSAGE.xapple=          Disabling APPLE App in cmake scripts
 xapple_FIND_CMD=               cd ${WRKSRC} && \
-       find . -name '*.cmake' -o -name CMakeLists.txt
+                               find . -name '*.cmake' -o -name CMakeLists.txt
 SUBST_FILES.xapple=            ${xapple_FIND_CMD:sh}
 SUBST_SED.xapple+=             -e 's,APPLE,XAPPLE,'
 SUBST_SED.xapple+=             -e 's,MACOSX_BUNDLE ,,'
 
+SUBST_CLASSES+=                        pyqt
+SUBST_STAGE.pyqt=              pre-configure
+SUBST_MESSAGE.pyqt=            Use correct python version for PyQt5 programs
+SUBST_FILES.pyqt=              cmake/PyQtMacros.cmake
+SUBST_SED.pyqt+=               -e '/^SET/s,pyuic5,&-${PYVERSSUFFIX},'
+SUBST_SED.pyqt+=               -e '/^SET/s,pyrcc5,&-${PYVERSSUFFIX},'
+
 CMAKE_ARGS+=   -DWITH_QTWEBKIT=FALSE
 CMAKE_ARGS+=   -DQWT_DIR=${QWT_DIR}
 # Useful for package development:
diff -r f32a5c2a91b2 -r c01bf9fe4b5e sysutils/dupeguru/Makefile
--- a/sysutils/dupeguru/Makefile        Sun Jan 26 12:54:15 2020 +0000
+++ b/sysutils/dupeguru/Makefile        Sun Jan 26 12:55:00 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:44 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/26 12:55:00 rhialto Exp $
 
 DISTNAME=      dupeguru-src-4.0.3
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    sysutils
 MASTER_SITES=  https://download.hardcoded.net/
 
@@ -29,10 +29,12 @@
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 REPLACE_PYTHON+=               qt/run_template.py
 
+MAKE_ENV+=     PYVERSSUFFIX=${PYVERSSUFFIX}
+
 INSTALLATION_DIRS=     bin share/applications share/dupeguru
 
 do-build:
-       cd ${WRKSRC} && ${PYTHONBIN} build.py
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py
        ${CHMOD} +x ${WRKSRC}/run.py
 
 do-install:
diff -r f32a5c2a91b2 -r c01bf9fe4b5e sysutils/dupeguru/distinfo
--- a/sysutils/dupeguru/distinfo        Sun Jan 26 12:54:15 2020 +0000
+++ b/sysutils/dupeguru/distinfo        Sun Jan 26 12:55:00 2020 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.2 2018/03/14 17:11:26 wiz Exp $
+$NetBSD: distinfo,v 1.3 2020/01/26 12:55:00 rhialto Exp $
 
 SHA1 (dupeguru-src-4.0.3.tar.gz) = a794780e187a36d45c384395e9bd8c2b8f5018bf
 RMD160 (dupeguru-src-4.0.3.tar.gz) = 5cd2b7f93276fcd8f09b699cfec5246f7dc5abed
 SHA512 (dupeguru-src-4.0.3.tar.gz) = dc8a5a122ad1d3d235825a498fb75b192566d3b5a33382ebb0002a361428af5cc453b143002ea3f57a9cb6ee30ce49f0b9f5a54bce2a90364fb1b92e102a289a
 Size (dupeguru-src-4.0.3.tar.gz) = 686580 bytes
+SHA1 (patch-Makefile) = 809ee7de40622a0e348df60b1251f2bed3c49b97
+SHA1 (patch-build.py) = 074a9adb4e48c07b637abe9183d49ece7d5520dc
 SHA1 (patch-hscommon_sphinxgen.py) = cd558d14733d394e7adf2b6b0c826dda5eed689f
 SHA1 (patch-qt_platform.py) = e97e226b53f57f8c4e9bf21f4726e024bb0b2d67
diff -r f32a5c2a91b2 -r c01bf9fe4b5e sysutils/dupeguru/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dupeguru/patches/patch-Makefile  Sun Jan 26 12:55:00 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/01/26 12:55:00 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- Makefile.orig      2016-11-25 01:04:31.000000000 +0000
++++ Makefile
+@@ -54,7 +54,7 @@ build/help : | env
+       ./env/bin/python build.py --doc
+ 
+ qt/dg_rc.py : qt/dg.qrc
+-      pyrcc5 qt/dg.qrc > qt/dg_rc.py
++      pyrcc5-${PYVERSSUFFIX} qt/dg.qrc > qt/dg_rc.py
+ 
+ i18n: $(mofiles)
+ 
diff -r f32a5c2a91b2 -r c01bf9fe4b5e sysutils/dupeguru/patches/patch-build.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/dupeguru/patches/patch-build.py  Sun Jan 26 12:55:00 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-build.py,v 1.1 2020/01/26 12:55:00 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- build.py.orig      2016-11-25 01:04:31.000000000 +0000
++++ build.py
+@@ -164,7 +164,8 @@ def build_qt(dev):
+     print("Building localizations")
+     build_localizations('qt')
+     print("Building Qt stuff")
+-    print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
++    pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"]
++    print_and_do(pyrcc5 +" {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
+     fix_qt_resource_file(op.join('qt', 'dg_rc.py'))
+     build_help()
+     print("Creating the run.py file")
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated databases/csharp-mysql to 8.0.19
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/py-qt5 to 5.13.2nb2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated databases/csharp-mysql to 8.0.19
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/py-qt5 to 5.13.2nb2
Indexes:
Home | Main Index | Thread Index | Old Index