[pkgsrc/trunk]: pkgsrc/multimedia/phonon Do not force C90 and remove some oth...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e68d37d486f
branches:  trunk
changeset: 626517:5e68d37d486f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Nov 13 22:51:06 2013 +0000

description:
Do not force C90 and remove some other pointless options that will
create issues with Clang builds. Bump revision.

diffstat:

 multimedia/phonon/Makefile                                     |   3 +-
 multimedia/phonon/distinfo                                     |   3 +-
 multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake |  24 ++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 70fcf67dc496 -r 5e68d37d486f multimedia/phonon/Makefile
--- a/multimedia/phonon/Makefile        Wed Nov 13 22:49:31 2013 +0000
+++ b/multimedia/phonon/Makefile        Wed Nov 13 22:51:06 2013 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2013/11/09 22:45:05 markd Exp $
+# $NetBSD: Makefile,v 1.37 2013/11/13 22:51:06 joerg Exp $
 
 DISTNAME=      phonon-4.7.0
+PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_KDE:=phonon/4.7.0/}
 EXTRACT_SUFX=  .tar.xz
diff -r 70fcf67dc496 -r 5e68d37d486f multimedia/phonon/distinfo
--- a/multimedia/phonon/distinfo        Wed Nov 13 22:49:31 2013 +0000
+++ b/multimedia/phonon/distinfo        Wed Nov 13 22:51:06 2013 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2013/11/09 22:45:05 markd Exp $
+$NetBSD: distinfo,v 1.9 2013/11/13 22:51:06 joerg Exp $
 
 SHA1 (phonon-4.7.0.tar.xz) = feda28afe016fe38eb253f2be01973fc0226d10f
 RMD160 (phonon-4.7.0.tar.xz) = dfe1dd8febc3b8304368340438d4f4f692ac8572
 Size (phonon-4.7.0.tar.xz) = 329792 bytes
+SHA1 (patch-cmake_FindPhononInternal.cmake) = b44464daf9542d985e1163cd0b5eb6db73a0b457
diff -r 70fcf67dc496 -r 5e68d37d486f multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake    Wed Nov 13 22:51:06 2013 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.1 2013/11/13 22:51:06 joerg Exp $
+
+--- cmake/FindPhononInternal.cmake.orig        2013-11-13 13:44:42.000000000 +0000
++++ cmake/FindPhononInternal.cmake
+@@ -320,16 +320,16 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+    # Select flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG -DQT_NO_DEBUG")
+-   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
++   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-inline")
+    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+    set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
+-   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
++   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-inline")
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ 
+-   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings 
-Wformat-security -Wmissing-format-attribute -fno-common")
++   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security 
-Wmissing-format-attribute -fno-common")
+    # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS 
-fno-check-new -fno-common")
+