CVS commit: pkgsrc/multimedia

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Mar 24 17:07:54 UTC 2018

Modified Files:
        pkgsrc/multimedia/phonon: distinfo
        pkgsrc/multimedia/phonon-qt5: Makefile
Added Files:
        pkgsrc/multimedia/phonon/patches: patch-cmake_PhononQt4.cmake

Log Message:
Don't force ancient C standard. Bump revision of phonon-qt5.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/phonon/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/phonon-qt5/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/phonon/distinfo
diff -u pkgsrc/multimedia/phonon/distinfo:1.18 pkgsrc/multimedia/phonon/distinfo:1.19
--- pkgsrc/multimedia/phonon/distinfo:1.18      Wed Jan 17 19:44:06 2018
+++ pkgsrc/multimedia/phonon/distinfo   Sat Mar 24 17:07:53 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2018/01/17 19:44:06 markd Exp $
+$NetBSD: distinfo,v 1.19 2018/03/24 17:07:53 joerg Exp $
 
 SHA1 (phonon-4.9.1.tar.xz) = aa58818675a2b3486da3a43f136ee11f88672eea
 RMD160 (phonon-4.9.1.tar.xz) = d6a348963d4ea5956a408c3f01ec2cda1beacfc4
 SHA512 (phonon-4.9.1.tar.xz) = a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728
 Size (phonon-4.9.1.tar.xz) = 321872 bytes
 SHA1 (patch-cmake_FindPhononInternal.cmake) = 637df634276927ce8cdeeaa8657a8bbd88380544
+SHA1 (patch-cmake_PhononQt4.cmake) = 6cd5a6768df140e9683ae21dbb0f7d54cdbca617

Index: pkgsrc/multimedia/phonon-qt5/Makefile
diff -u pkgsrc/multimedia/phonon-qt5/Makefile:1.18 pkgsrc/multimedia/phonon-qt5/Makefile:1.19
--- pkgsrc/multimedia/phonon-qt5/Makefile:1.18  Mon Mar 12 11:15:40 2018
+++ pkgsrc/multimedia/phonon-qt5/Makefile       Sat Mar 24 17:07:53 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2018/03/12 11:15:40 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/03/24 17:07:53 joerg Exp $
 
 DISTNAME=      phonon-4.9.1
 PKGNAME=       ${DISTNAME:S/-/-qt5-/}
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       Multimedia API for KF5
 

Added files:

Index: pkgsrc/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake
diff -u /dev/null pkgsrc/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake:1.1
--- /dev/null   Sat Mar 24 17:07:54 2018
+++ pkgsrc/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake        Sat Mar 24 17:07:53 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-cmake_PhononQt4.cmake,v 1.1 2018/03/24 17:07:53 joerg Exp $
+
+--- cmake/PhononQt4.cmake.orig 2018-03-23 23:44:05.722447056 +0000
++++ cmake/PhononQt4.cmake
+@@ -196,7 +196,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+    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")
+ 
+@@ -318,7 +318,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clan
+    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")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-common 
-fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden")
+    set(KDE4_C_FLAGS    "-fvisibility=hidden")
+