Attachment 189619 Details for Bug 224319 – Patch to 5.35.0

[patch] Patch to 5.35.0

fet-5.35.0.diff (text/plain), 6.71 KB, created by Zsolt Udvari on 2018-01-11 15:59:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2018-01-11 15:59:39 UTC

Size: 6.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 458644)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fet
>-DISTVERSION=	5.34.0
>+DISTVERSION=	5.35.0
> CATEGORIES=	deskutils kde
> MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
> 		http://lalescu.ro/liviu/fet/download/old/ \
>@@ -15,53 +15,65 @@
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		qmake tar:bzip2
>+USES=		tar:bzip2
> 
> PORTEXAMPLES=	*
> 
>-DESKTOP_ENTRIES="FET" \
>-		"Free timetable software" \
>-		"" \
>-		"fet" \
>-		"Education;Qt;" \
>-		true
>-
>-OPTIONS_DEFINE=	EXAMPLES NLS ONLYCL
>+OPTIONS_DEFINE=	EXAMPLES NLS
> OPTIONS_SINGLE=	QTVER
> OPTIONS_SINGLE_QTVER=	QT4 QT5
> OPTIONS_DEFAULT=	QT4
> ONLYCL_DESC=	Build only command line version (without Qt GUI)
> 
>+FLAVORS=	gui cli
>+cli_PKGNAMESUFFIX=	-cli
>+
> OPTIONS_SUB=	yes
> 
>-QT4_USE=	QT4=corelib,moc_build,rcc_build,uic_build,xml
>-QT5_USE=	QT5=buildtools_build,core,xml GL=gl
>-
> .include <bsd.port.options.mk>
> 
>+USES+=	qmake
>+.	if ${FLAVOR:U} == cli
>+PLIST_SUB+=	CLI="" EXAMPLES="" GUI="@comment "
> INSTALL_TARGET=	${WRKSRC}/fet-cl
>-.if ${PORT_OPTIONS:MONLYCL}
> QMAKE_SOURCE_PATH=	${WRKSRC}/src/src-cl.pro
>-.else
>-INSTALL_TARGET+=	${WRKSRC}/fet
>-.if ${PORT_OPTIONS:MQT4}
>-USE_QT4+=gui network
>-.else
>+.		if ${PORT_OPTIONS:MQT4}
>+USE_QT4+=corelib moc_build rcc_build uic_build xml
>+.		else # not 'QT4'
>+USE_QT5+=	buildtools_build core xml
>+USE_GL=	gl
>+.		endif # QT-version in 'cli' flavor
>+.	else # not 'cli'
>+DESKTOP_ENTRIES="FET" \
>+		"Free timetable software" \
>+		"" \
>+		"fet" \
>+		"Education;Qt;" \
>+		true
>+PLIST_SUB+=	CLI="@comment " EXAMPLES="" GUI=""
>+INSTALL_TARGET=	${WRKSRC}/fet
>+.		if ${PORT_OPTIONS:MQT4}
>+USE_QT4+=gui network corelib moc_build rcc_build uic_build xml
>+.		else # not 'QT4'
>+USE_QT5+=	buildtools_build core xml
>+USE_GL=	gl
> USE_QT5+=gui network printsupport widgets
>-.endif
>-.endif
>+.		endif # QT-version in 'gui' flavor
>+. endif # cli or gui flavor
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
>-		${WRKSRC}/src/interface/fet.cpp
>-
> do-install:
> 	${INSTALL_PROGRAM} ${INSTALL_TARGET} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/man/fet*.gz ${STAGEDIR}${MANPREFIX}/man/man1
>+.if ${FLAVOR:U} == gui
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
> 	cd ${WRKSRC}/translations && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}/translations
>+.endif
> 
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
>+		${WRKSRC}/src/interface/fet.cpp
>+
> do-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 458644)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1509887144
>-SHA256 (fet-5.34.0.tar.bz2) = a049cd89d7a6ed73e67758d1a01ee740fdaa245943be2911c0a9002dda27a836
>-SIZE (fet-5.34.0.tar.bz2) = 11200465
>+TIMESTAMP = 1515683621
>+SHA256 (fet-5.35.0.tar.bz2) = d460eb0953991b611e6e1aa27880700ff4a89e00fef4ad37398842f5dc9e7d44
>+SIZE (fet-5.35.0.tar.bz2) = 11479580
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 458644)
>+++ pkg-plist	(working copy)
>@@ -1,39 +1,40 @@
>-%%NO_ONLYCL%%bin/fet
>-bin/fet-cl
>-man/man1/fet.1.gz
>-man/man1/fet-cl.1.gz
>-%%NLS%%%%DATADIR%%/translations/fet_ar.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ca.qm
>-%%NLS%%%%DATADIR%%/translations/fet_cs.qm
>-%%NLS%%%%DATADIR%%/translations/fet_da.qm
>-%%NLS%%%%DATADIR%%/translations/fet_de.qm
>-%%NLS%%%%DATADIR%%/translations/fet_el.qm
>-%%NLS%%%%DATADIR%%/translations/fet_en_GB.qm
>-%%NLS%%%%DATADIR%%/translations/fet_es.qm
>-%%NLS%%%%DATADIR%%/translations/fet_eu.qm
>-%%NLS%%%%DATADIR%%/translations/fet_fa.qm
>-%%NLS%%%%DATADIR%%/translations/fet_fr.qm
>-%%NLS%%%%DATADIR%%/translations/fet_gl.qm
>-%%NLS%%%%DATADIR%%/translations/fet_he.qm
>-%%NLS%%%%DATADIR%%/translations/fet_hu.qm
>-%%NLS%%%%DATADIR%%/translations/fet_id.qm
>-%%NLS%%%%DATADIR%%/translations/fet_it.qm
>-%%NLS%%%%DATADIR%%/translations/fet_lt.qm
>-%%NLS%%%%DATADIR%%/translations/fet_mk.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ms.qm
>-%%NLS%%%%DATADIR%%/translations/fet_nl.qm
>-%%NLS%%%%DATADIR%%/translations/fet_pl.qm
>-%%NLS%%%%DATADIR%%/translations/fet_pt_BR.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ro.qm
>-%%NLS%%%%DATADIR%%/translations/fet_ru.qm
>-%%NLS%%%%DATADIR%%/translations/fet_si.qm
>-%%NLS%%%%DATADIR%%/translations/fet_sk.qm
>-%%NLS%%%%DATADIR%%/translations/fet_sr.qm
>-%%NLS%%%%DATADIR%%/translations/fet_sq.qm
>-%%NLS%%%%DATADIR%%/translations/fet_tr.qm
>-%%NLS%%%%DATADIR%%/translations/fet_uk.qm
>-%%NLS%%%%DATADIR%%/translations/fet_untranslated.qm
>-%%NLS%%%%DATADIR%%/translations/fet_uz.qm
>-%%NLS%%%%DATADIR%%/translations/fet_vi.qm
>-%%NLS%%%%DATADIR%%/translations/fet_zh_CN.qm
>-%%NLS%%%%DATADIR%%/translations/fet_zh_TW.qm
>+%%GUI%%bin/fet
>+%%CLI%%bin/fet-cl
>+%%GUI%%man/man1/fet.1.gz
>+%%CLI%%man/man1/fet-cl.1.gz
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ar.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ca.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_cs.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_da.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_de.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_el.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_en_GB.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_es.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_eu.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_fa.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_fr.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_gl.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_he.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_hu.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_id.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_it.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ja.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_lt.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_mk.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ms.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_nl.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_pl.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_pt_BR.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ro.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ru.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_si.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sk.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sr.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sq.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_tr.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_uk.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_untranslated.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_uz.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_vi.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_zh_CN.qm
>+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_zh_TW.qm

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 224319: 188800 | 189107 | 189108 | 189619 | 189890 | 191329 | 191727