[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/

[Michael Palimaka]

commit:     530ab1e60ae5a831e45bf68527471dc4f40685a8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 13:13:10 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 13:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530ab1e6

media-libs/phonon: add patch by Ryan Hill <rhill <AT> gentoo.org> to fix build with GCC5.

Gentoo-bug: 555866

Package-Manager: portage-2.2.26

 media-libs/phonon/files/phonon-4.8.3-gcc5.patch | 34 +++++++++++++++++++++++++
 media-libs/phonon/phonon-4.8.3-r1.ebuild        |  5 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)

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 0000000..5038d73
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.8.3-gcc5.patch
@@ -0,0 +1,34 @@
+commit e966180fbba1812f8050a743351036d573c19b1f
+Author: Ryan Hill <rhill@g.o>
+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 d308940..c1b5b0e 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) )