diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-12-16 00:13:10 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-12-16 00:13:35 +1100 |
| commit | 530ab1e60ae5a831e45bf68527471dc4f40685a8 (patch) | |
| tree | ba2886a7409528fb663ce5582d95ec9be5d7e6e5 /media-libs/phonon | |
| parent | dev-vcs/tortoisehg: Removed old. (diff) | |
| download | gentoo-530ab1e60ae5a831e45bf68527471dc4f40685a8.tar.gz gentoo-530ab1e60ae5a831e45bf68527471dc4f40685a8.tar.bz2 gentoo-530ab1e60ae5a831e45bf68527471dc4f40685a8.zip | |
media-libs/phonon: add patch by Ryan Hill <rhill@gentoo.org> to fix build with GCC5.
Gentoo-bug: 555866
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-libs/phonon')
| -rw-r--r-- | media-libs/phonon/files/phonon-4.8.3-gcc5.patch | 34 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-4.8.3-r1.ebuild | 5 |
2 files changed, 38 insertions, 1 deletions
diff --git a/media-libs/phonon/files/phonon-4.8.3-gcc5.patch b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch new file mode 100644 index 000000000000..5038d732804e --- /dev/null +++ b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch @@ -0,0 +1,34 @@ +commit e966180fbba1812f8050a743351036d573c19b1f +Author: Ryan Hill <rhill@gentoo.org> +Date: Sun Sep 13 06:17:43 2015 -0600 + + Fix build failure with GCC 5 and Qt 5.4.2. + + Recent versions of GCC (>=5.1) will sometimes emit copy relocations when + compiling with -fPIE, which causes some Qt applications to crash. As of + 5.4.2 all code built against Qt must instead be compiled with -fPIC. + + Enabling CMAKE_POSITION_INDEPENDENT_CODE will cause cmake to add -fPIC or + -fPIE depending on the type of object being built. The try_compile() test + for -fvisibility=hidden support is creating an executable so -fPIE is used + which makes Qt throw a fit. + + Gentoo-Bug: https://bugs.gentoo.org/555866 + See-Also: https://bugreports.qt.io/browse/QTBUG-45755 +--- + cmake/FindPhononInternal.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/cmake/FindPhononInternal.cmake ++++ b/cmake/FindPhononInternal.cmake +@@ -109,8 +109,8 @@ else (NOT PHONON_BUILD_PHONON4QT5) # Qt5 + find_package(Qt5Widgets) + macro_log_feature(Qt5Widgets_FOUND "Qt5 Widgets (qtbase)" "" "" TRUE) + +- if (Qt5_POSITION_INDEPENDENT_CODE) +- set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_PIC}") + endif() + + #---- compat diff --git a/media-libs/phonon/phonon-4.8.3-r1.ebuild b/media-libs/phonon/phonon-4.8.3-r1.ebuild index d308940bee1d..c1b5b0eb8eed 100644 --- a/media-libs/phonon/phonon-4.8.3-r1.ebuild +++ b/media-libs/phonon/phonon-4.8.3-r1.ebuild @@ -58,7 +58,10 @@ PDEPEND=" vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] ) " -PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" + "${FILESDIR}/${P}-gcc5.patch" +) pkg_setup() { MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |