Attachment 241526 Details for Bug 270690 – update/add flavors v1

[patch] update/add flavors v1

fet-qt6qt5-6.9.0.diff (text/plain), 1.83 KB, created by Nuno Teixeira on 2023-04-16 10:35:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2023-04-16 10:35:37 UTC

Size: 1.83 KB

patch

obsolete

>diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
>index 533c9274261f..d41922e0063b 100644
>--- a/deskutils/fet/Makefile
>+++ b/deskutils/fet/Makefile
>@@ -1,10 +1,11 @@
> PORTNAME=	fet
>-DISTVERSION=	6.8.7
>+DISTVERSION=	6.9.0
> CATEGORIES=	deskutils education
> MASTER_SITES=	https://lalescu.ro/liviu/fet/download/ \
> 		https://lalescu.ro/liviu/fet/download/old/ \
> 		https://timetabling.de/download/ \
> 		https://timetabling.de/download/old/
>+PKGNAMESUFFIX=	-${FLAVOR}
> 
> MAINTAINER=	uzsolt@uzsolt.hu
> COMMENT=	Free timetabling software
>@@ -13,9 +14,16 @@ WWW=		https://lalescu.ro/liviu/fet/
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		compiler:c++14-lang gl qmake qt:5 tar:bzip2
>+FLAVORS=	qt5 qt6
>+FLAVOR?=	qt6
>+qt5_CONFLICTS_INSTALL=fet-qt6
>+qt6_CONFLICTS_INSTALL=fet-qt5
>+
>+USES=		compiler:c++14-lang gl qmake qt:${FLAVOR:S/qt//} tar:bzip2
> USE_GL=		gl
>-USE_QT=		core printsupport widgets buildtools:build
>+_USE_QT5=	core printsupport widgets buildtools:build
>+_USE_QT6=	base
>+USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
> 
> INSTALL_TARGET=	${WRKSRC}/fet-cl
> 
>@@ -35,7 +43,7 @@ ONLYCL_DESC=	Build only command line version (without Qt GUI)
> 
> ONLYCL_VARS=		QMAKE_SOURCE_PATH=${WRKSRC}/src/src-cl.pro
> ONLYCL_VARS_OFF=	INSTALL_TARGET+=${WRKSRC}/fet \
>-			USE_QT+="gui network"
>+			_USE_QT5+="gui network"
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
>diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
>index bb5a4bbae165..7221f2638674 100644
>--- a/deskutils/fet/distinfo
>+++ b/deskutils/fet/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1679062403
>-SHA256 (fet-6.8.7.tar.bz2) = 35b8657b2cfc2fea4f039fb9028c0fb2505d2184c7aae23f903b38fc98169471
>-SIZE (fet-6.8.7.tar.bz2) = 18844884
>+TIMESTAMP = 1680876722
>+SHA256 (fet-6.9.0.tar.bz2) = daf39231f7c9e4ca99c0540f2e4a78172513044db35266bfc3b0d1a01e2adcd2
>+SIZE (fet-6.9.0.tar.bz2) = 18857314

Flags:

eduardo: maintainer-approval? (uzsolt)

Actions: View | Diff

Attachments on bug 270690: 241340 | 241352 | 241526 | 241537