summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2018-03-24 17:07:53 +0000
committerjoerg <joerg@pkgsrc.org>2018-03-24 17:07:53 +0000
commit88ca206fff3bfadc127230ac2a37c6ed0682382e (patch)
tree7e8af7a93b20edb9c902be4ee553ceb791830778 /multimedia
parent562184d3ce62ea7eae4c79a0bfd674138e47cb33 (diff)
downloadpkgsrc-88ca206fff3bfadc127230ac2a37c6ed0682382e.tar.gz
Don't force ancient C standard. Bump revision of phonon-qt5.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/phonon-qt5/Makefile4
-rw-r--r--multimedia/phonon/distinfo3
-rw-r--r--multimedia/phonon/patches/patch-cmake_PhononQt4.cmake22
3 files changed, 26 insertions, 3 deletions
diff --git a/multimedia/phonon-qt5/Makefile b/multimedia/phonon-qt5/Makefile
index a35c9baf0fa..da408476fee 100644
--- a/multimedia/phonon-qt5/Makefile
+++ b/multimedia/phonon-qt5/Makefile
@@ -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
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 0d88c93274c..23d7f36e29f 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -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
diff --git a/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake b/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake
new file mode 100644
index 00000000000..8252a84e54a
--- /dev/null
+++ b/multimedia/phonon/patches/patch-cmake_PhononQt4.cmake
@@ -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")
+