Attachment 199044 Details for Bug 231821 – patch v4 (Qt5 support with FLAVORS)

[patch] patch v4 (Qt5 support with FLAVORS)

clipgrab.diff (text/plain), 2.65 KB, created by kikadf on 2018-11-07 10:18:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kikadf

Created: 2018-11-07 10:18:49 UTC

Size: 2.65 KB

patch

obsolete

>Index: multimedia/clipgrab/Makefile
>===================================================================
>--- multimedia/clipgrab/Makefile	(revision 484390)
>+++ multimedia/clipgrab/Makefile	(working copy)
>@@ -2,24 +2,38 @@
> # $FreeBSD$
> 
> PORTNAME=	clipgrab
>-PORTVERSION=	3.4.11
>+PORTVERSION=	3.7.1
> CATEGORIES=	multimedia
>-MASTER_SITES=	http://download.clipgrab.de/
>+MASTER_SITES=	https://download.clipgrab.org/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	kikadf.01@gmail.com
> COMMENT=	Program to download videos from YouTube and etc
> 
> LICENSE=	GPLv3
> 
>-USES=		qmake qt:4 tar:bzip2
>-USE_QT=		gui xml uic_build moc_build \
>+FLAVORS=	qt4 qt5
>+qt5_PKGNAMESUFFIX=	-qt5
>+qt5_CONFLICTS_INSTALL=	${PORTNAME}
>+qt4_CONFLICTS_INSTALL=	${PORTNAME}${qt5_PKGNAMESUFFIX}
>+
>+.if ${FLAVOR:U} == qt5
>+PATCH_SITES=	https://gitlab.com/kikadf/clipgrab-qt5/raw/patches/patches/
>+PATCHFILES=	clipgrab-qt5-${PORTVERSION}.patch:-p1
>+
>+USES=		qmake qt:5
>+USE_QT=		buildtools_build core network dbus webkit xml
>+
>+.else
>+USES=		qmake qt:4
>+USE_QT=		corelib gui xml uic_build moc_build \
> 		rcc_build network dbus webkit
>+.endif
> 
> PLIST_FILES=	bin/${PORTNAME} \
>-		%%DATADIR%%/icon.png \
>-		%%DATADIR%%/logo.png \
>-		%%DATADIR%%/paypal-logo.png \
>-		%%DATADIR%%/splash.png
>+		${DATADIR}/icon.png \
>+		${DATADIR}/logo.png \
>+		${DATADIR}/paypal-logo.png \
>+		${DATADIR}/splash.png
> 
> DESKTOP_ENTRIES="Clipgrab" "Download and convert videos from YouTube and etc" \
> 		"${DATADIR}/icon.png" "${PORTNAME}" \
>@@ -28,8 +42,7 @@
> QMAKE_SOURCE_PATH=	${WRKSRC}/${PORTNAME}.pro
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's,img/,share/${PORTNAME}/,g' \
>-	${WRKSRC}/*.cpp
>+	@${REINPLACE_CMD} -e 's,img/,share/${PORTNAME}/,g' ${WRKSRC}/*.cpp
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${DATADIR}
>Index: multimedia/clipgrab/distinfo
>===================================================================
>--- multimedia/clipgrab/distinfo	(revision 484390)
>+++ multimedia/clipgrab/distinfo	(working copy)
>@@ -1,2 +1,5 @@
>-SHA256 (clipgrab-3.4.11.tar.bz2) = 48f7cbd9a503b19246ae2d31af8d2bba7c57945f5ba8ca4fcf7bf6b3a265bd83
>-SIZE (clipgrab-3.4.11.tar.bz2) = 371620
>+TIMESTAMP = 1539195391
>+SHA256 (clipgrab-3.7.1.tar.gz) = addf58c027f8f0e01acb0d1d6cdb9fd17c356d4fe5e2d768b94e531b599d1f2e
>+SIZE (clipgrab-3.7.1.tar.gz) = 628542
>+SHA256 (clipgrab-qt5-3.7.1.patch) = 2efa3a821c352f4093315439365d600b9c93cc64562e2d2f8da9f67882b61cde
>+SIZE (clipgrab-qt5-3.7.1.patch) = 24473
>Index: multimedia/clipgrab/pkg-descr
>===================================================================
>--- multimedia/clipgrab/pkg-descr	(revision 484390)
>+++ multimedia/clipgrab/pkg-descr	(working copy)
>@@ -10,4 +10,4 @@
> -MyVideo
> -MySpass
> 
>-WWW: http://clipgrab.de
>+WWW: https://clipgrab.org

Actions: View | Diff

Attachments on bug 231821: 197630 | 197999 | 198037 | 199044 | 199167 | 199388