Attachment #165562 for bug #205889




# $FreeBSD: head/audio/rosegarden/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $

PORTNAME=	rosegarden
PORTVERSION=	15.12.1
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}


RUN_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
		lilypond:${PORTSDIR}/print/lilypond

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}

USES=		cmake:outsource desktop-file-utils gmake pkgconfig \
		shared-mime-info tar:bzip2
USE_QT4=	gui network xml \
		linguisttools_build moc_build rcc_build uic_build
QT_NONSTANDARD=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-qtdir=${QT_PREFIX} \
		--with-qtlibdir=${QT_LIBDIR}

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_SINGLE=		TOOLKIT
OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
OPTIONS_DEFAULT=	QT4

QR4_USES=		compiler:c++0x
QT4_USE=		qt4=gui,network,testlib,xml \
			qt4=linguisttools_build,moc_build,qmake_build \
			qt4=rcc_build,uic_build
QT4_CMAKE_ON=		-DUSE_QT4:BOOL=ON
QT5_USES=		compiler:c++11-lib
QT5_USE=		qt5=network,printsupport,testlib,widgets,xml \
			qt5=buildtools_build,linguisttools_build,qmake_build
QT5_CMAKE_ON=		-DUSE_QT5:BOOL=ON
TOOLKIT_DESC=		Qt toolkit

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/rosegarden/distinfo (-2 / +2 lines)
1	SHA256 (rosegarden-15.10.2.tar.bz2) = d4e8488c3447763a7d4b57925dc9d462e9e21efe647962431ea21aad8930a0a3	1	SHA256 (rosegarden-15.12.1.tar.bz2) = b3aff1057a5ebba216982b17ed7f74d7283f6fb6c8714a7e12b91434a2077450
2	SIZE (rosegarden-15.10.2.tar.bz2) = 6380389	2	SIZE (rosegarden-15.12.1.tar.bz2) = 6406834




--- src/gui/application/main.cpp.orig	2015-12-31 13:49:35 UTC
+++ src/gui/application/main.cpp
@@ -354,6 +354,11 @@ void usage()
     exit(2);
 }
 
+#ifdef __GNUG__
+#pragma GCC push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
 int main(int argc, char *argv[])
 {
     for (int i = 1; i < argc; ++i) {
@@ -377,7 +382,6 @@ int main(int argc, char *argv[])
     // (this has to be outside the ifdef block below)
     QSettings preAppSettings("rosegardenmusic", "Rosegarden");
     preAppSettings.beginGroup(GeneralOptionsConfigGroup);
-#pragma GCC diagnostic ignored "-Wunused-variable"
     unsigned int graphicsSystem = preAppSettings.value("graphics_system", Native).toUInt();
     preAppSettings.endGroup();
 
@@ -840,4 +844,7 @@ int main(int argc, char *argv[])
 
     return returnCode;
 }
+#ifdef __GNUG__
+#pragma GCC pop
+#endif
 

Return to bug 205889

Lines 2-8 Link Here

(-)audio/rosegarden/Makefile (-16 / +19 lines)
2	# $FreeBSD: head/audio/rosegarden/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $	2	# $FreeBSD: head/audio/rosegarden/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $
3		3
4	PORTNAME= rosegarden	4	PORTNAME= rosegarden
5	PORTVERSION= 15.10.2	5	PORTVERSION= 15.12.1
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
8		8
Lines 22-45 Link Here
22	RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \	22	RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \
23	lilypond:${PORTSDIR}/print/lilypond	23	lilypond:${PORTSDIR}/print/lilypond
24		24
25	USES= compiler:c++0x desktop-file-utils gmake pkgconfig \	25	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
		26
		27	USES= cmake:outsource desktop-file-utils gmake pkgconfig \
26	shared-mime-info tar:bzip2	28	shared-mime-info tar:bzip2
27	USE_QT4= gui network xml \
28	linguisttools_build moc_build rcc_build uic_build
29	QT_NONSTANDARD= yes
30	GNU_CONFIGURE= yes
31	CONFIGURE_ARGS= --with-qtdir=${QT_PREFIX} \
32	--with-qtlibdir=${QT_LIBDIR}
33		29
34	CPPFLAGS+= -I${LOCALBASE}/include	30	CFLAGS+= -I${LOCALBASE}/include
35	LDFLAGS+= -L${LOCALBASE}/lib	31	LDFLAGS+= -L${LOCALBASE}/lib
36		32
37	post-patch:	33	OPTIONS_SINGLE= TOOLKIT
38	@${REINPLACE_CMD} -e \	34	OPTIONS_SINGLE_TOOLKIT= QT4 QT5
39	's\|15\.10\.1\|${PORTVERSION}\| ; \	35	OPTIONS_DEFAULT= QT4
40	/LIBS/s\|-ldl\|\|' ${WRKSRC}/configure	36
41		37	QR4_USES= compiler:c++0x
42	post-install:	38	QT4_USE= qt4=gui,network,testlib,xml \
43	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rosegarden	39	qt4=linguisttools_build,moc_build,qmake_build \
		40	qt4=rcc_build,uic_build
		41	QT4_CMAKE_ON= -DUSE_QT4:BOOL=ON
		42	QT5_USES= compiler:c++11-lib
		43	QT5_USE= qt5=network,printsupport,testlib,widgets,xml \
		44	qt5=buildtools_build,linguisttools_build,qmake_build
		45	QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON
		46	TOOLKIT_DESC= Qt toolkit
44		47
45	.include <bsd.port.mk>	48	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/rosegarden/files/patch-src__gui__application__main.cpp (+30 lines)
	1	--- src/gui/application/main.cpp.orig 2015-12-31 13:49:35 UTC
	2	+++ src/gui/application/main.cpp
	3	@@ -354,6 +354,11 @@ void usage()
	4	exit(2);
	5	}
	6
	7	+#ifdef __GNUG__
	8	+#pragma GCC push
	9	+#pragma GCC diagnostic ignored "-Wunused-variable"
	10	+#endif
	11	+
	12	int main(int argc, char *argv[])
	13	{
	14	for (int i = 1; i < argc; ++i) {
	15	@@ -377,7 +382,6 @@ int main(int argc, char *argv[])
	16	// (this has to be outside the ifdef block below)
	17	QSettings preAppSettings("rosegardenmusic", "Rosegarden");
	18	preAppSettings.beginGroup(GeneralOptionsConfigGroup);
	19	-#pragma GCC diagnostic ignored "-Wunused-variable"
	20	unsigned int graphicsSystem = preAppSettings.value("graphics_system", Native).toUInt();
	21	preAppSettings.endGroup();
	22
	23	@@ -840,4 +844,7 @@ int main(int argc, char *argv[])
	24
	25	return returnCode;
	26	}
	27	+#ifdef __GNUG__
	28	+#pragma GCC pop
	29	+#endif
	30