From owner-svn-ports-head@freebsd.org Thu Aug 9 02:51:21 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BF501076C20; Thu, 9 Aug 2018 02:51:21 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C63F37B1C2; Thu, 9 Aug 2018 02:51:20 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A721313810; Thu, 9 Aug 2018 02:51:20 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w792pKSE094627; Thu, 9 Aug 2018 02:51:20 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w792pJHf094623; Thu, 9 Aug 2018 02:51:19 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201808090251.w792pJHf094623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 9 Aug 2018 02:51:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476718 - head/multimedia/py-openlp X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: head/multimedia/py-openlp X-SVN-Commit-Revision: 476718 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2018 02:51:21 -0000 Author: pi Date: Thu Aug 9 02:51:19 2018 New Revision: 476718 URL: https://svnweb.freebsd.org/changeset/ports/476718 Log: multimedia/py-openlp: Update 2.1.6 -> 2.4.6 - adds LICENSE_FILE - copies OpenLP to ${PREFIX}/bin (= renamed copy of openlp.py) with appropriate workaround for the openlp.desktop file. This is required to start the software. Otherwise it yields the following error: ImportError: No module named 'openlp.core'; 'openlp' is not a package. - added INSTALLS_ICONS to pet portlint - merged pre-build target into post-build target - sorted variables a bit PR: 211665 Submitted by: Kai Changes: https://openlp.org/blog/2017/04/02/fix-all-the-bugs-openlp-246 https://openlp.org/blog/2017/02/05/a-few-more-bugs-fixed-openlp-245 https://openlp.org/blog/2016/11/27/openlp-244-released https://openlp.org/blog/2016/09/25/openlp-243-and-personal-news https://openlp.org/blog/2016/06/26/openlp-242-released https://openlp.org/blog/2016/05/01/openlp-241-released https://openlp.org/blog/2016/02/14/openlp-24-released https://openlp.org/blog/2015/11/01/first-22-series-bugfix-release-openlp-221 https://openlp.org/blog/2015/10/18/openlp-22-released Modified: head/multimedia/py-openlp/Makefile head/multimedia/py-openlp/distinfo head/multimedia/py-openlp/pkg-descr head/multimedia/py-openlp/pkg-plist Modified: head/multimedia/py-openlp/Makefile ============================================================================== --- head/multimedia/py-openlp/Makefile Thu Aug 9 02:43:44 2018 (r476717) +++ head/multimedia/py-openlp/Makefile Thu Aug 9 02:51:19 2018 (r476718) @@ -1,57 +1,61 @@ # $FreeBSD$ PORTNAME= OpenLP -PORTVERSION= 2.1.6 -PORTREVISION= 2 +PORTVERSION= 2.4.6 CATEGORIES= multimedia python -MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} +MASTER_SITES= https://get.openlp.org/${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Open Source Lyrics Projection LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=0:databases/py-alembic@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ unoconv:textproc/unoconv -USES= desktop-file-utils pyqt:4 python:2.7 qt:4 -USE_PYQT= core gui \ - network_run opengl_run phonon_run svg_run test_run webkit_run +USES= desktop-file-utils pyqt:5 python:3.4+ qt:5 +USE_PYQT= core_run gui_run multimedia_run network_run opengl_run printsupport_run \ + sip_run svg_run webkit_run webkitwidgets_run widgets_run USE_PYTHON= distutils autoplist +USE_QT= linguist_build USE_GSTREAMER= good bad ugly -USE_QT= linguist phonon-gst -QT_LRELEASE= ${LRELEASE} + +INSTALLS_ICONS= yes NO_ARCH= yes -pre-build: - @${RM} ${WRKSRC}/resources/__init__.py +ICON_SIZES= 16x16 32x32 48x48 64x64 128x128 256x256 + +post-patch: + @${REINPLACE_CMD} -e 's|openlp\.py|OpenLP|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -Ee 's|^(Exec=)openlp|\1OpenLP|' ${WRKSRC}/resources/openlp.desktop + @(cd ${WRKSRC} && ${MV} openlp.py OpenLP) + +post-build: + @${RM} -r ${WRKSRC}/build/lib/tests @${MKDIR} ${WRKSRC}/resources/i18n/qm @set -e; \ for TSFILE in ${WRKSRC}/resources/i18n/*.ts; do \ - ${QT_LRELEASE} $$TSFILE -qm ${WRKSRC}/resources/i18n/qm/`basename $$TSFILE .ts`.qm; \ + ${LRELEASE} $$TSFILE -qm ${WRKSRC}/resources/i18n/qm/`basename $$TSFILE .ts`.qm; \ done post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/openlp/i18n ${INSTALL_DATA} ${WRKSRC}/resources/i18n/qm/*.qm ${STAGEDIR}${PREFIX}/share/openlp/i18n - ${LN} -sf openlp.pyw ${STAGEDIR}${PREFIX}/bin/openlp ${INSTALL_DATA} ${WRKSRC}/resources/openlp.desktop ${STAGEDIR}${PREFIX}/share/applications - set -e; \ - for SIZE in 16x16 32x32 48x48 64x64 128x128 256x256; do \ - ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$$SIZE/apps && \ - ${INSTALL_DATA} ${WRKSRC}/resources/images/openlp-logo-$$SIZE.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/$$SIZE/apps/openlp.png; \ - done + +.for s in ${ICON_SIZES} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA} ${WRKSRC}/resources/images/openlp-logo-${s}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/openlp.png +.endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/resources/images/openlp-logo.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/openlp.svg Modified: head/multimedia/py-openlp/distinfo ============================================================================== --- head/multimedia/py-openlp/distinfo Thu Aug 9 02:43:44 2018 (r476717) +++ head/multimedia/py-openlp/distinfo Thu Aug 9 02:51:19 2018 (r476718) @@ -1,2 +1,3 @@ -SHA256 (OpenLP-2.1.6.tar.gz) = 15e8e6cbf2cbf1348cfceb74520b0d3e90e52d089eab92895779dc1df644bbce -SIZE (OpenLP-2.1.6.tar.gz) = 7199150 +TIMESTAMP = 1533634074 +SHA256 (OpenLP-2.4.6.tar.gz) = f63dcf5f1f8a8199bf55e806b44066ad920d26c9cf67ae432eb8cdd1e761fc30 +SIZE (OpenLP-2.4.6.tar.gz) = 7303683 Modified: head/multimedia/py-openlp/pkg-descr ============================================================================== --- head/multimedia/py-openlp/pkg-descr Thu Aug 9 02:43:44 2018 (r476717) +++ head/multimedia/py-openlp/pkg-descr Thu Aug 9 02:51:19 2018 (r476718) @@ -1,6 +1,5 @@ -OpenLP is free church presentation software, or lyrics projection -software, used to display slides of songs, Bible verses, videos, -images, and even presentations for church worship using a computer -and a data projector. +OpenLP is a free church presentation software, or lyrics projection software, +used to display slides of songs, Bible verses, videos, images, and even +presentations for church worship using a computer and a data projector. -WWW: http://openlp.org +WWW: https://openlp.org Modified: head/multimedia/py-openlp/pkg-plist ============================================================================== --- head/multimedia/py-openlp/pkg-plist Thu Aug 9 02:43:44 2018 (r476717) +++ head/multimedia/py-openlp/pkg-plist Thu Aug 9 02:51:19 2018 (r476718) @@ -1,4 +1,3 @@ -bin/openlp share/applications/openlp.desktop share/icons/hicolor/128x128/apps/openlp.png share/icons/hicolor/16x16/apps/openlp.png