Attachment 195985 Details for Bug 211665 – py-openlp-2.6.4.patch

[patch] py-openlp-2.6.4.patch

py-openlp-2.6.4.patch (text/plain), 5.38 KB, created by Kai Knoblich on 2018-08-07 18:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2018-08-07 18:50:11 UTC

Size: 5.38 KB

patch

obsolete

>Index: py-openlp/Makefile
>===================================================================
>--- py-openlp/Makefile	(revision 476608)
>+++ py-openlp/Makefile	(working copy)
>@@ -1,10 +1,9 @@
> # $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
>@@ -11,47 +10,52 @@
> 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}enchant>0:textproc/py-enchant@${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}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
> 
>Index: py-openlp/distinfo
>===================================================================
>--- py-openlp/distinfo	(revision 476608)
>+++ py-openlp/distinfo	(working copy)
>@@ -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
>Index: py-openlp/pkg-descr
>===================================================================
>--- py-openlp/pkg-descr	(revision 476608)
>+++ py-openlp/pkg-descr	(working copy)
>@@ -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
>Index: py-openlp/pkg-plist
>===================================================================
>--- py-openlp/pkg-plist	(revision 476608)
>+++ py-openlp/pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-bin/openlp
> share/applications/openlp.desktop
> share/icons/hicolor/128x128/apps/openlp.png
> share/icons/hicolor/16x16/apps/openlp.png

Flags:

kai: maintainer-approval+

Actions: View | Diff

Attachments on bug 211665: 173411 | 190440 | 190464 | 190465 | 195985