Update ot 17.04

* drop files/patch-src_gui_application_main.cpp
  -- it built fine with gcc5 gcc6 and clang without it

Approved by:	rakuco (mentor, implicit)
Differential Revision:	https://reviews.freebsd.org/D10829
This commit is contained in:
Tobias C. Berner 2017-05-20 10:22:43 +00:00
parent 86d4857041
commit 71bcff8ecb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=441305
3 changed files with 4 additions and 35 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= rosegarden
PORTVERSION= 16.06
PORTREVISION= 1
PORTVERSION= 17.04
CATEGORIES= audio
MASTER_SITES= SF

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1477047066
SHA256 (rosegarden-16.06.tar.bz2) = 1044334f2c1a2ac7560d80910e0721c8913bd924f8185a393f630c89020340db
SIZE (rosegarden-16.06.tar.bz2) = 6362923
TIMESTAMP = 1495262222
SHA256 (rosegarden-17.04.tar.bz2) = 988a6141c5b0a8e85c029f650de78bf57100c4d778c22d0194b0692584640ece
SIZE (rosegarden-17.04.tar.bz2) = 6454603

View File

@ -1,30 +0,0 @@
--- src/gui/application/main.cpp.orig 2016-02-29 12:18:01 UTC
+++ src/gui/application/main.cpp
@@ -359,6 +359,11 @@ void usage()
exit(2);
}
+#ifdef __GNUG__
+#pragma GCC push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
int main(int argc, char *argv[])
{
@@ -405,7 +410,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();
@@ -868,4 +872,7 @@ int main(int argc, char *argv[])
return returnCode;
}
+#ifdef __GNUG__
+#pragma GCC pop
+#endif