diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
| commit | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (patch) | |
| tree | f88035a58c20099cf45a576fb53b0330a4754f14 /media-libs/phonon/phonon-9999.ebuild | |
| parent | 0fb71e0215ed52863e462cccef73c01aff44d43d (diff) | |
gentoo resync : 20.12.2017
Diffstat (limited to 'media-libs/phonon/phonon-9999.ebuild')
| -rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index e39cec4c2f67..b16a70f4b3c9 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -50,10 +50,6 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) pkg_setup() { - if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then - ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" - fi - MULTIBUILD_VARIANTS=( $(usev qt4) qt5 ) } @@ -63,15 +59,20 @@ multilib_src_configure() { -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE -DWITH_GLIB2=$(usex pulseaudio) -DWITH_PulseAudio=$(usex pulseaudio) - -DWITH_QZeitgeist=OFF -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake ) if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF ) + mycmakeargs+=( + -DPHONON_BUILD_PHONON4QT5=OFF + -DWITH_QZeitgeist=OFF + ) fi if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON ) + mycmakeargs+=( + -DPHONON_BUILD_PHONON4QT5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + ) fi cmake-utils_src_configure |