diff options
-rw-r--r-- | finance/kmymoney/Makefile | 6 | ||||
-rw-r--r-- | www/Makefile | 1 | ||||
-rw-r--r-- | www/py-weboob-qt/Makefile | 51 | ||||
-rw-r--r-- | www/py-weboob-qt/distinfo | 3 | ||||
-rw-r--r-- | www/py-weboob-qt/files/patch-setup.cfg | 19 | ||||
-rw-r--r-- | www/py-weboob-qt/pkg-descr | 5 | ||||
-rw-r--r-- | www/py-weboob/Makefile | 17 | ||||
-rw-r--r-- | www/py-weboob/distinfo | 6 |
8 files changed, 88 insertions, 20 deletions
diff --git a/finance/kmymoney/Makefile b/finance/kmymoney/Makefile index ea4dfc270a62..2bbd156888a9 100644 --- a/finance/kmymoney/Makefile +++ b/finance/kmymoney/Makefile @@ -2,7 +2,7 @@ PORTNAME= kmymoney PORTVERSION= 5.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src @@ -93,8 +93,8 @@ SQLCIPHER_LIB_DEPENDS= libsqlcipher.so:databases/sqlcipher SQLCIPHER_CMAKE_BOOL= ENABLE_SQLCIPHER WEBOOB_DESC= Online banking via Web Outside Of Browsers -WEBOOB_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>0:www/py-weboob@${PY_FLAVOR} -WEBOOB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>0:www/py-weboob@${PY_FLAVOR} +WEBOOB_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob-qt>0:www/py-weboob-qt@${PY_FLAVOR} +WEBOOB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob-qt>0:www/py-weboob-qt@${PY_FLAVOR} WEBOOB_USES= python:3.7+ WEBOOB_USE= qt=concurrent WEBOOB_CMAKE_BOOL= ENABLE_WEBOOB diff --git a/www/Makefile b/www/Makefile index 2883c5469726..f30aa5ef5bbd 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1760,6 +1760,7 @@ SUBDIR += py-webassets SUBDIR += py-webob SUBDIR += py-weboob + SUBDIR += py-weboob-qt SUBDIR += py-websocket-client SUBDIR += py-webunit SUBDIR += py-werkzeug diff --git a/www/py-weboob-qt/Makefile b/www/py-weboob-qt/Makefile new file mode 100644 index 000000000000..f13fbe5747e8 --- /dev/null +++ b/www/py-weboob-qt/Makefile @@ -0,0 +1,51 @@ +# $FreeBSD$ + +PORTNAME= weboob-qt +PORTVERSION= 2.0 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= jhale@FreeBSD.org +COMMENT= Web Outside of Browsers + +LICENSE= LGPL3+ +LICENSE_FILE= ${WRKSRC}/COPYING.LESSER + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR} + +USES= gmake pyqt:5 python:3.6+ +USE_PYQT= core gui multimedia multimediawidgets sip widgets +USE_PYTHON= autoplist distutils + +BINARY_ALIAS= pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER} + +NO_ARCH= yes + +PYDISTUTILS_BUILDARGS= ${CONFIGURE_ARGS} +PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} ${CONFIGURE_ARGS} + +# weboob-qt attempts to install __init__.py and the generated bytecode into +# these directories which conflicts with those installed by weboob. We need to +# delete these files and their entries in the generated plist post-install. +COMMON_DIRS= weboob \ + weboob/applications \ + weboob/tools \ + weboob/tools/application + +post-patch: + @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py + @(cd ${WRKSRC}/man && ${FIND} . -type f ! -name 'q*' -and ! -name '*qt.1' -delete) + +post-install: +.for dir in ${COMMON_DIRS:S|/|\/|g} + @${REINPLACE_CMD} -e '/.*\/${dir}\/__init__.py/d' \ + -e '/.*\/${dir}\/__pycache__.*/d' \ + ${WRKDIR}/.PLIST.pymodtmp +.endfor +.for dir in ${COMMON_DIRS} + @(cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${dir} && ${RM} -r __pycache__ __init__.py) +.endfor + +.include <bsd.port.mk> diff --git a/www/py-weboob-qt/distinfo b/www/py-weboob-qt/distinfo new file mode 100644 index 000000000000..d3c937d042c3 --- /dev/null +++ b/www/py-weboob-qt/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1593412735 +SHA256 (weboob-qt-2.0.tar.gz) = a894c0e685317210c472058c6533a6e02e4d5c1e77c2ec0888e671fb98b99fd0 +SIZE (weboob-qt-2.0.tar.gz) = 900778 diff --git a/www/py-weboob-qt/files/patch-setup.cfg b/www/py-weboob-qt/files/patch-setup.cfg new file mode 100644 index 000000000000..01318011dbe1 --- /dev/null +++ b/www/py-weboob-qt/files/patch-setup.cfg @@ -0,0 +1,19 @@ +For some reason when the check for PyQt5 is present, the applications fail to +start with the error below. Before the Qt applications were split out, it was +noted in the weboob setup.py that the check does not work properly [1]. Not +sure why it was reintroduced after the split. + +[1] https://git.weboob.org/weboob/weboob/blob/83e59081a4d30194d4d3eeb87c73a2067b7070c4/setup.py#L182 + +pkg_resources.DistributionNotFound: The 'PyQt5' distribution was not found and is required by weboob-qt + +--- setup.cfg.orig 2021-01-01 05:18:36 UTC ++++ setup.cfg +@@ -75,7 +75,6 @@ classifiers = + python_requires = >= 3.5 + install_requires = + weboob +- PyQt5 + + [options.entry_points] + gui_scripts = diff --git a/www/py-weboob-qt/pkg-descr b/www/py-weboob-qt/pkg-descr new file mode 100644 index 000000000000..6ca2c9e9c9c3 --- /dev/null +++ b/www/py-weboob-qt/pkg-descr @@ -0,0 +1,5 @@ +Weboob is a collection of applications able to interact with websites, +without requiring the user to open them in a browser. It also +provides well-defined APIs to talk to websites lacking one. + +WWW: http://weboob.org diff --git a/www/py-weboob/Makefile b/www/py-weboob/Makefile index bd9dbfbbafad..ff6557679105 100644 --- a/www/py-weboob/Makefile +++ b/www/py-weboob/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= weboob -PORTVERSION= 1.5 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -38,30 +37,20 @@ NO_ARCH= yes PYDISTUTILS_BUILDARGS= ${CONFIGURE_ARGS} PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} ${CONFIGURE_ARGS} -OPTIONS_DEFINE= CLICOLOR MMS NSS QT5 RTMPDUMP -OPTIONS_DEFAULT= CLICOLOR NSS QT5 +OPTIONS_DEFINE= CLICOLOR NSS RTMPDUMP +OPTIONS_DEFAULT= CLICOLOR NSS CLICOLOR_DESC= Color command line interface CLICOLOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} -MMS_RUN_DEPENDS= mimms:multimedia/mimms - NSS_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ ${PYTHON_PKGNAMEPREFIX}python-nss>0:security/py-python-nss@${PY_FLAVOR} -QT5_USES= gmake pyqt:5 -QT5_USE= PYQT=core,gui,multimedia,multimediawidgets,sip,widgets -QT5_BINARY_ALIAS= pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER} -QT5_CONFIGURE_ON= --qt --xdg -QT5_CONFIGURE_OFF= --no-qt --no-xdg - RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/etc/ssl|g' ${WRKSRC}/weboob/browser/nss.py - -post-patch-QT5-off: @(cd ${WRKSRC}/man && ${RM} q*.1 weboob-config-qt.1) .include <bsd.port.mk> diff --git a/www/py-weboob/distinfo b/www/py-weboob/distinfo index f7e8a1e01d74..6b22c60b6923 100644 --- a/www/py-weboob/distinfo +++ b/www/py-weboob/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553835883 -SHA256 (weboob-1.5.tar.gz) = 7ac1851281a127182f8e8630853c8ab2e635a534928b35150b75d5d0e24b3fb1 -SIZE (weboob-1.5.tar.gz) = 1084274 +TIMESTAMP = 1593411484 +SHA256 (weboob-2.0.tar.gz) = fc8be1f77ad3a53285cef8b20a8b747960c163fad729c56838043d8ddcdfc9b0 +SIZE (weboob-2.0.tar.gz) = 1014657 |