cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks

Browse Source 
due to changing "-I/usr/local/include/kde4" to
"-isystem /usr/local/include/kde4". Still investigating, who to blame:
CMake, Phonon or maybe someone else... not me, right?

(note for myself: there is no such thing as extra build for KDE stuff)

Breakage noticed by naddy@: thanks and sorry.
This commit is contained in:
zhuk 2015-07-06 23:54:04 +00:00
parent 6619783cf4
commit 2e8b53ca43
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/phonon/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2015/07/05 01:24:04 zhuk Exp $
# $OpenBSD: Makefile,v 1.17 2015/07/06 23:54:04 zhuk Exp $
COMMENT = multimedia layer for Qt4/KDE4
CATEGORIES = multimedia devel
VERSION = 4.8.3
DISTNAME = phonon-${VERSION}
HOMEPAGE = http://phonon.kde.org/
REVISION = 0
# Renamed to avoid clashing with Qt4's one
# XXX major should be tweaked on any update, to unbreak

15
multimedia/phonon/patches/patch-phonon_CMakeLists_txt Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-phonon_CMakeLists_txt,v 1.3 2015/07/06 23:54:04 zhuk Exp $
Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
due to changing "-I/usr/local/include/kde4" to
"-isystem /usr/local/include/kde4".
--- phonon/CMakeLists.txt.orig Tue Jul 7 02:46:03 2015
+++ phonon/CMakeLists.txt Tue Jul 7 02:46:41 2015
@@ -172,8 +172,6 @@ set_target_properties(${PHONON_LIB_SONAME} PROPERTIES
# This reduces inter-package dependencies and makes it easier to remove
# dependencies of shared libraries without breaking binary compatibility.
-target_include_directories(${PHONON_LIB_SONAME}
- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
install(TARGETS ${PHONON_LIB_SONAME} EXPORT PhononLibs ${INSTALL_TARGETS_DEFAULT_ARGS} )

15
multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-phonon_experimental_CMakeLists_txt,v 1.1 2015/07/06 23:54:04 zhuk Exp $
Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
due to changing "-I/usr/local/include/kde4" to
"-isystem /usr/local/include/kde4".
--- phonon/experimental/CMakeLists.txt.orig Tue Jul 7 02:46:03 2015
+++ phonon/experimental/CMakeLists.txt Tue Jul 7 02:46:41 2015
@@ -29,8 +29,6 @@ set_target_properties(${PHONON_LIB_SONAME}experimental
LINK_INTERFACE_LIBRARIES ""
)
install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT PhononLibs ${INSTALL_TARGETS_DEFAULT_ARGS})
-target_include_directories(${PHONON_LIB_SONAME}experimental
- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
########### install headers ###############
install(FILES