svn commit: r409755 - in head/audio/rosegarden: . files
Thomas Zander
riggs at FreeBSD.org
Sun Feb 28 18:31:13 UTC 2016
Author: riggs
Date: Sun Feb 28 18:31:12 2016
New Revision: 409755
URL: https://svnweb.freebsd.org/changeset/ports/409755
Log:
Update to upstream version 15.12.1
PR: 205889
Submitted by: tkato432 at yahoo.com
Added:
head/audio/rosegarden/files/
head/audio/rosegarden/files/patch-src__gui__application__main.cpp (contents, props changed)
Modified:
head/audio/rosegarden/Makefile
head/audio/rosegarden/distinfo
Modified: head/audio/rosegarden/Makefile
==============================================================================
--- head/audio/rosegarden/Makefile Sun Feb 28 18:30:44 2016 (r409754)
+++ head/audio/rosegarden/Makefile Sun Feb 28 18:31:12 2016 (r409755)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rosegarden
-PORTVERSION= 15.10.2
+PORTVERSION= 15.12.1
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
@@ -22,24 +22,29 @@ LIB_DEPENDS= libasound.so:${PORTSDIR}/au
RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \
lilypond:${PORTSDIR}/print/lilypond
-USES= compiler:c++0x desktop-file-utils gmake pkgconfig \
+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}
-CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|15\.10\.1|${PORTVERSION}| ; \
- /LIBS/s|-ldl||' ${WRKSRC}/configure
+INSTALLS_ICONS= yes
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rosegarden
+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>
Modified: head/audio/rosegarden/distinfo
==============================================================================
--- head/audio/rosegarden/distinfo Sun Feb 28 18:30:44 2016 (r409754)
+++ head/audio/rosegarden/distinfo Sun Feb 28 18:31:12 2016 (r409755)
@@ -1,2 +1,2 @@
-SHA256 (rosegarden-15.10.2.tar.bz2) = d4e8488c3447763a7d4b57925dc9d462e9e21efe647962431ea21aad8930a0a3
-SIZE (rosegarden-15.10.2.tar.bz2) = 6380389
+SHA256 (rosegarden-15.12.1.tar.bz2) = b3aff1057a5ebba216982b17ed7f74d7283f6fb6c8714a7e12b91434a2077450
+SIZE (rosegarden-15.12.1.tar.bz2) = 6406834
Added: head/audio/rosegarden/files/patch-src__gui__application__main.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/rosegarden/files/patch-src__gui__application__main.cpp Sun Feb 28 18:31:12 2016 (r409755)
@@ -0,0 +1,30 @@
+--- 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
+
More information about the svn-ports-all
mailing list